From ed32015f4a0536e842306a207d620ec5e3f665c0 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 25 Dec 2009 12:50:27 +0800 Subject: Set the brightness to a fixed value. Bug: 2318682 Change-Id: I367fde55fab1102019accd69e69dc516c583c153 --- src/com/android/camera/Camera.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/com/android/camera/Camera.java') diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index bb4fb99..a95c2b2 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -48,6 +48,7 @@ import android.os.SystemClock; import android.os.SystemProperties; import android.preference.PreferenceManager; import android.provider.MediaStore; +import android.provider.Settings; import android.util.AttributeSet; import android.util.Log; import android.view.Display; @@ -98,6 +99,10 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, private static final int RESTART_PREVIEW = 3; private static final int CLEAR_SCREEN_DELAY = 4; + // The brightness settings 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. + private static final float DEFAULT_CAMERA_BRIGHTNESS = 0.7f; + private static final String GPS_MODE_ON = "on"; private static final String GPS_MODE_OFF = "off"; @@ -913,6 +918,18 @@ public class Camera extends NoSearchActivity implements View.OnClickListener, 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); -- cgit v1.1