Move set screen brightness later so we can start preview earlier.

1 files changed, 16 insertions, 14 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index f853f8c..0b1155e 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -324,6 +324,8 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
 
         ImageManager.ensureOSXCompatibleFolder();
 
+        initializeScreenBrightness();
+
         installIntentFilter();
 
         initializeFocusTone();
@@ -918,20 +920,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        Window win = getWindow();
-
-        // Overright the brightness settings if it is automatic
-        int mode = Settings.System.getInt(
-                getContentResolver(),
-                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);
-        }
-
-        win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         setContentView(R.layout.camera);
         mSurfaceView = (SurfaceView) findViewById(R.id.camera_preview);
 
@@ -1316,6 +1304,20 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
         }
     }
 
+    private void initializeScreenBrightness() {
+        Window win = getWindow();
+        // Overright the brightness settings if it is automatic
+        int mode = Settings.System.getInt(
+                getContentResolver(),
+                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);
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();