diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 19 | ||||
-rw-r--r-- | src/com/android/camera/settings/AppUpgrader.java | 23 | ||||
-rw-r--r-- | src/com/android/camera/settings/Keys.java | 9 |
3 files changed, 50 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a1357b49c..d78590f18 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -296,6 +296,8 @@ public class CameraActivity extends QuickActivity // Keep track of powershutter state public boolean mPowerShutter; + // Keep track of max brightness state + public boolean mMaxBrightness; @Override public CameraAppUI getCameraAppUI() { @@ -573,6 +575,8 @@ public class CameraActivity extends QuickActivity public void onSettingChanged(SettingsManager settingsManager, String key) { if (key.equals(Keys.KEY_POWER_SHUTTER)) { initPowerShutter(); + } else if (key.equals(Keys.KEY_MAX_BRIGHTNESS)) { + initMaxBrightness(); } } @@ -1508,6 +1512,7 @@ public class CameraActivity extends QuickActivity ModulesInfo.setupModules(mAppContext, mModuleManager, mFeatureConfig); initPowerShutter(); + initMaxBrightness(); AppUpgrader appUpgrader = new AppUpgrader(this); appUpgrader.upgrade(mSettingsManager); @@ -2233,6 +2238,20 @@ public class CameraActivity extends QuickActivity } } + protected void initMaxBrightness() { + Window win = getWindow(); + WindowManager.LayoutParams params = win.getAttributes(); + + mMaxBrightness = Keys.isMaxBrightnessOn(mSettingsManager); + if (mMaxBrightness) { + params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL; + } else { + params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE; + } + + win.setAttributes(params); + } + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (!mFilmstripVisible) { diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java index 113f4d23b..277960728 100644 --- a/src/com/android/camera/settings/AppUpgrader.java +++ b/src/com/android/camera/settings/AppUpgrader.java @@ -92,9 +92,14 @@ public class AppUpgrader extends SettingsUpgrader { private static final int CAMERA_SETTINGS_POWER_SHUTTER = 8; /** + * With this version, port over max brightness settings. + */ + private static final int CAMERA_SETTINGS_MAX_BRIGHTNESS = 9; + + /** * Increment this value whenever new AOSP UpgradeSteps need to be executed. */ - public static final int APP_UPGRADE_VERSION = 8; + public static final int APP_UPGRADE_VERSION = 9; private final AppController mAppController; @@ -170,6 +175,10 @@ public class AppUpgrader extends SettingsUpgrader { if (lastVersion < CAMERA_SETTINGS_POWER_SHUTTER) { upgradePowerShutter(settingsManager); } + + if (lastVersion < CAMERA_SETTINGS_MAX_BRIGHTNESS) { + upgradeMaxBrightness(settingsManager); + } } /** @@ -453,6 +462,18 @@ public class AppUpgrader extends SettingsUpgrader { } } + private void upgradeMaxBrightness(SettingsManager settingsManager) { + SharedPreferences oldGlobalPreferences = + settingsManager.openPreferences(OLD_GLOBAL_PREFERENCES_FILENAME); + if (oldGlobalPreferences.contains(Keys.KEY_MAX_BRIGHTNESS)) { + String maxBrightness = removeString(oldGlobalPreferences, Keys.KEY_MAX_BRIGHTNESS); + if (OLD_SETTINGS_VALUE_ON.equals(maxBrightness)) { + settingsManager.set(SettingsManager.SCOPE_GLOBAL, Keys.KEY_MAX_BRIGHTNESS, + true); + } + } + } + /** * The R.integer.camera_mode_* indices were cleaned up, resulting in * removals and renaming of certain values. In particular camera_mode_gcam diff --git a/src/com/android/camera/settings/Keys.java b/src/com/android/camera/settings/Keys.java index 31200b30d..f59591f84 100644 --- a/src/com/android/camera/settings/Keys.java +++ b/src/com/android/camera/settings/Keys.java @@ -82,6 +82,7 @@ public class Keys { "pref_should_show_settings_button_cling"; public static final String KEY_HAS_SEEN_PERMISSIONS_DIALOGS = "pref_has_seen_permissions_dialogs"; public static final String KEY_POWER_SHUTTER = "pref_power_shutter"; + public static final String KEY_MAX_BRIGHTNESS = "pref_max_brightness"; /** * Set some number of defaults for the defined keys. @@ -232,5 +233,13 @@ public class Keys { return settingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, KEY_POWER_SHUTTER); } + + /** + * Returns whether max brightness is set on. + */ + public static boolean isMaxBrightnessOn(SettingsManager settingsManager) { + return settingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, + KEY_MAX_BRIGHTNESS); + } } |