TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent screen from fading

Browse Source
This commit is contained in:
Sergey Solovyev 2013-06-25 17:24:49 +04:00
parent 2fb20dc2b5
commit e1b0679263
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android-app-core/res/values/text_preferences.xml
View File

@ -20,4 +20,7 @@
<string name="p_calculations_calculate_on_fly_summary">If turned on calculations are done automatically while typing <string name="p_calculations_calculate_on_fly_summary">If turned on calculations are done automatically while typing
expression expression
</string> </string>
<string name="prefs_prevent_screen_from_fading_title">Prevent screen from fading</string>
<string name="prefs_prevent_screen_from_fading_summary">If turned on screen will not fade while using the app</string>
</resources> </resources>

2
android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
View File

@ -59,6 +59,7 @@ public final class CalculatorPreferences {
public static final Preference<Boolean> showEqualsButton = BooleanPreference.of("showEqualsButton", true); public static final Preference<Boolean> showEqualsButton = BooleanPreference.of("showEqualsButton", true);
public static final Preference<Boolean> autoOrientation = BooleanPreference.of("autoOrientation", true); public static final Preference<Boolean> autoOrientation = BooleanPreference.of("autoOrientation", true);
public static final Preference<Boolean> hideNumeralBaseDigits = BooleanPreference.of("hideNumeralBaseDigits", true); public static final Preference<Boolean> hideNumeralBaseDigits = BooleanPreference.of("hideNumeralBaseDigits", true);
public static final Preference<Boolean> preventScreenFromFading = BooleanPreference.of("preventScreenFromFading", true);
@Nonnull @Nonnull
public static Theme getTheme(@Nonnull SharedPreferences preferences) { public static Theme getTheme(@Nonnull SharedPreferences preferences) {
@ -196,6 +197,7 @@ public final class CalculatorPreferences {
applyDefaultPreference(preferences, Gui.showEqualsButton); applyDefaultPreference(preferences, Gui.showEqualsButton);
applyDefaultPreference(preferences, Gui.autoOrientation); applyDefaultPreference(preferences, Gui.autoOrientation);
applyDefaultPreference(preferences, Gui.hideNumeralBaseDigits); applyDefaultPreference(preferences, Gui.hideNumeralBaseDigits);
applyDefaultPreference(preferences, Gui.preventScreenFromFading);
applyDefaultPreference(preferences, Graph.plotImag); applyDefaultPreference(preferences, Graph.plotImag);
applyDefaultPreference(preferences, History.showIntermediateCalculations); applyDefaultPreference(preferences, History.showIntermediateCalculations);

5
android-app/res/xml/preferences_appearance.xml
View File

@ -97,6 +97,11 @@
a:title="@string/prefs_history_show_intermediate_calculations_title" a:title="@string/prefs_history_show_intermediate_calculations_title"
a:summary="@string/prefs_history_show_intermediate_calculations_summary" /> a:summary="@string/prefs_history_show_intermediate_calculations_summary" />
<android.preference.CheckBoxPreference
a:key="preventScreenFromFading"
a:title="@string/prefs_prevent_screen_from_fading_title"
a:summary="@string/prefs_prevent_screen_from_fading_summary" />
</PreferenceScreen> </PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>

11
android-app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -20,6 +20,8 @@ import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
@ -41,6 +43,8 @@ import javax.annotation.Nullable;
import static android.os.Build.VERSION_CODES.GINGERBREAD_MR1; import static android.os.Build.VERSION_CODES.GINGERBREAD_MR1;
import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH; import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH;
import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
import static org.solovyev.android.calculator.CalculatorPreferences.Gui.preventScreenFromFading;
import static org.solovyev.android.calculator.wizard.Wizard.FIRST_TIME_WIZARD; import static org.solovyev.android.calculator.wizard.Wizard.FIRST_TIME_WIZARD;
import static org.solovyev.android.calculator.wizard.Wizard.isWizardFinished; import static org.solovyev.android.calculator.wizard.Wizard.isWizardFinished;
import static org.solovyev.android.calculator.wizard.Wizard.isWizardStarted; import static org.solovyev.android.calculator.wizard.Wizard.isWizardStarted;
@ -222,6 +226,13 @@ public class CalculatorActivity extends SherlockFragmentActivity implements Shar
Activities.restartActivity(this); Activities.restartActivity(this);
} }
final Window window = getWindow();
if (preventScreenFromFading.getPreference(preferences)) {
window.addFlags(FLAG_KEEP_SCREEN_ON);
} else {
window.clearFlags(FLAG_KEEP_SCREEN_ON);
}
this.activityHelper.onResume(this); this.activityHelper.onResume(this);
} }