summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DisplaySettings.java
diff options
context:
space:
mode:
authorDvTonder <david.vantonder@gmail.com>2013-06-01 13:46:24 -0400
committerDvTonder <david.vantonder@gmail.com>2013-06-02 19:36:59 -0400
commit0724c8c742a3641f14eb143d0cf7fb8e90f8d8bb (patch)
tree29740aa4aa350eb2b92cf4a16b9118e351300aab /src/com/android/settings/DisplaySettings.java
parentff42ec782a25e92135c0a362644c58b9ca0c210f (diff)
downloadpackages_apps_settings-0724c8c742a3641f14eb143d0cf7fb8e90f8d8bb.zip
packages_apps_settings-0724c8c742a3641f14eb143d0cf7fb8e90f8d8bb.tar.gz
packages_apps_settings-0724c8c742a3641f14eb143d0cf7fb8e90f8d8bb.tar.bz2
Settings: Add support to enable/disable Electron Beam (2/2)
Parts were brought over from CM9 but not all of it. This completes the port. Change-Id: I5ebfab22e68ea34e3babfaacd9c8103e25932d3d
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
-rw-r--r--src/com/android/settings/DisplaySettings.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index d88c2f1..f7ca7ea 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -63,6 +63,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_DISPLAY_ROTATION = "display_rotation";
private static final String KEY_WAKEUP_CATEGORY = "category_wakeup_options";
private static final String KEY_VOLUME_WAKE = "pref_volume_wake";
+ private static final String KEY_SCREEN_OFF_ANIMATION = "screen_off_animation";
// Strings used for building the summary
private static final String ROTATION_ANGLE_0 = "0";
@@ -86,6 +87,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private WifiDisplayStatus mWifiDisplayStatus;
private Preference mWifiDisplayPreference;
+ private CheckBoxPreference mScreenOffAnimation;
+
private ContentObserver mAccelerometerRotationObserver =
new ContentObserver(new Handler()) {
@Override
@@ -153,6 +156,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
}
+ mScreenOffAnimation = (CheckBoxPreference) findPreference(KEY_SCREEN_OFF_ANIMATION);
+ if(getResources().getBoolean(com.android.internal.R.bool.config_screenOffAnimation)) {
+ mScreenOffAnimation.setChecked(Settings.System.getInt(resolver,
+ Settings.System.SCREEN_OFF_ANIMATION, 1) == 1);
+ } else {
+ getPreferenceScreen().removePreference(mScreenOffAnimation);
+ }
+
}
private void updateDisplayRotationPreferenceDescription() {
@@ -388,6 +399,10 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
Settings.System.putInt(getContentResolver(), Settings.System.VOLUME_WAKE_SCREEN,
mVolumeWake.isChecked() ? 1 : 0);
return true;
+ } else if (preference == mScreenOffAnimation) {
+ Settings.System.putInt(getContentResolver(), Settings.System.SCREEN_OFF_ANIMATION,
+ mScreenOffAnimation.isChecked() ? 1 : 0);
+ return true;
}
return super.onPreferenceTreeClick(preferenceScreen, preference);