Merge "Adjust the screen brightness in the panorama mode." into ics-factoryrom

1 files changed, 17 insertions, 0 deletions

diff --git a/src/com/android/camera/Util.java b/src/com/android/camera/Util.java
index 906dc1e6..c5bc79d3 100644
--- a/src/com/android/camera/Util.java
+++ b/src/com/android/camera/Util.java
@@ -35,6 +35,7 @@ import android.location.Location;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -65,6 +66,11 @@ public class Util {
     private static final int DIRECTION_UP = 2;
     private static final int DIRECTION_DOWN = 3;
 
+    // The brightness setting used when it is set to automatic in the system.
+    // The reason why it is set to 0.7 is just because 1.0 is too bright.
+    // Use the same setting among the Camera, VideoCamera and Panorama modes.
+    private static final float DEFAULT_CAMERA_BRIGHTNESS = 0.7f;
+
     public static final String REVIEW_ACTION = "com.android.camera.action.REVIEW";
 
     // Private intent extras. Test only.
@@ -593,4 +599,15 @@ public class Util {
         params.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE;
         window.setAttributes(params);
     }
+
+    public static void initializeScreenBrightness(Window win, ContentResolver resolver) {
+        // Overright the brightness settings if it is automatic
+        int mode = Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS_MODE,
+                Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+        if (mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+            WindowManager.LayoutParams winParams = win.getAttributes();
+            winParams.screenBrightness = DEFAULT_CAMERA_BRIGHTNESS;
+            win.setAttributes(winParams);
+        }
+    }
 }