1 files changed, 19 insertions, 0 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) {