summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/settings/AppUpgrader.java
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-02-14 02:53:32 +0200
committerMichael Bestas <mikeioannina@gmail.com>2015-12-03 23:59:55 +0200
commita3f0c03c004fc09efcc992a63c9812cab40f4c90 (patch)
tree29329716dc62b8026d8ef37e28c78586d107a965 /src/com/android/camera/settings/AppUpgrader.java
parent5540a7ef263e22ea802f8fb06c98d47d1328e518 (diff)
downloadandroid_packages_apps_Camera2-a3f0c03c004fc09efcc992a63c9812cab40f4c90.tar.gz
android_packages_apps_Camera2-a3f0c03c004fc09efcc992a63c9812cab40f4c90.tar.bz2
android_packages_apps_Camera2-a3f0c03c004fc09efcc992a63c9812cab40f4c90.zip
Camera2: Add option to set max screen brightness
* Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
Diffstat (limited to 'src/com/android/camera/settings/AppUpgrader.java')
-rw-r--r--src/com/android/camera/settings/AppUpgrader.java23
1 files changed, 22 insertions, 1 deletions
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