diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-14 06:21:58 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:38 +0200 |
commit | 580d6924533ef479e1f28f58cd1745899ca5cddf (patch) | |
tree | 9d9f85da81a1fe56ab0ee21e913d0ccf1f1619f6 /src | |
parent | d9700f7e060f4b4c32528bee970c6e4e6c1184f9 (diff) | |
download | android_packages_apps_Snap-580d6924533ef479e1f28f58cd1745899ca5cddf.tar.gz android_packages_apps_Snap-580d6924533ef479e1f28f58cd1745899ca5cddf.tar.bz2 android_packages_apps_Snap-580d6924533ef479e1f28f58cd1745899ca5cddf.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')
-rwxr-xr-x | src/com/android/camera/CameraActivity.java | 20 | ||||
-rw-r--r-- | src/com/android/camera/CameraSettings.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/ComboPreferences.java | 3 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoMenu.java | 4 | ||||
-rwxr-xr-x | src/com/android/camera/PhotoModule.java | 7 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/VideoModule.java | 4 |
7 files changed, 40 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 52fd35896..fb0e13170 100755 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -215,6 +215,8 @@ public class CameraActivity extends Activity private boolean mInCameraApp = true; // Keep track of powershutter state public static boolean mPowerShutter = false; + // Keep track of max brightness state + public static boolean mMaxBrightness = false; private int mLastRawOrientation; private MyOrientationEventListener mOrientationListener; private Handler mMainHandler; @@ -1943,6 +1945,24 @@ public class CameraActivity extends Activity } } + protected void initMaxBrightness(ComboPreferences prefs) { + String val = prefs.getString(CameraSettings.KEY_MAX_BRIGHTNESS, + getResources().getString(R.string.pref_camera_max_brightness_default)); + + Window win = getWindow(); + WindowManager.LayoutParams params = win.getAttributes(); + + mMaxBrightness = val.equals(CameraSettings.VALUE_ON); + + if (mMaxBrightness && mInCameraApp) { + params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL; + } else { + params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE; + } + + win.setAttributes(params); + } + protected void setResultEx(int resultCode) { mResultCodeForTesting = resultCode; setResult(resultCode); diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index a5e59987c..7143ec6a8 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -79,6 +79,7 @@ public class CameraSettings { public static final String KEY_STARTUP_MODULE_INDEX = "camera.startup_module"; public static final String KEY_POWER_SHUTTER = "pref_power_shutter"; + public static final String KEY_MAX_BRIGHTNESS = "pref_max_brightness"; public static final String KEY_VIDEO_ENCODER = "pref_camera_videoencoder_key"; public static final String KEY_AUDIO_ENCODER = "pref_camera_audioencoder_key"; public static final String KEY_POWER_MODE = "pref_camera_powermode_key"; diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java index 8031ab149..ba04d646c 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -159,7 +159,8 @@ public class ComboPreferences implements || key.equals(SettingsManager.KEY_MONO_ONLY) || key.equals(SettingsManager.KEY_MONO_PREVIEW) || key.equals(SettingsManager.KEY_CLEARSIGHT) - || key.equals(CameraSettings.KEY_POWER_SHUTTER); + || key.equals(CameraSettings.KEY_POWER_SHUTTER) + || key.equals(CameraSettings.KEY_MAX_BRIGHTNESS); } @Override diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 1b57253cc..418f41a15 100755 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -195,7 +195,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_SELFIE_MIRROR, CameraSettings.KEY_SHUTTER_SOUND - CameraSettings.KEY_POWER_SHUTTER + CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS }; mOtherKeys2 = new String[] { @@ -215,6 +216,7 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS, CameraSettings.KEY_AUTO_HDR, CameraSettings.KEY_HDR_MODE, CameraSettings.KEY_HDR_NEED_1X, diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 659688b38..2a7109007 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -577,6 +577,9 @@ public class PhotoModule // Power shutter mActivity.initPowerShutter(mPreferences); + // Max brightness + mActivity.initMaxBrightness(mPreferences); + if (mOpenCameraThread == null) { mOpenCameraThread = new OpenCameraThread(); mOpenCameraThread.start(); @@ -2598,6 +2601,9 @@ public class PhotoModule // Load the power shutter mActivity.initPowerShutter(mPreferences); + // Load max brightness + mActivity.initMaxBrightness(mPreferences); + mNamedImages = null; if (mLocationManager != null) mLocationManager.recordLocation(false); @@ -4698,6 +4704,7 @@ public class PhotoModule mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, mPreferences); mActivity.initPowerShutter(mPreferences); + mActivity.initMaxBrightness(mPreferences); } else { mHandler.sendEmptyMessage(SET_PHOTO_UI_PARAMS); } diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 7af839bb7..45e161dee 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -119,7 +119,8 @@ public class VideoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_DIS, - CameraSettings.KEY_POWER_SHUTTER + CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS }; mOtherKeys2 = new String[] { CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, @@ -131,6 +132,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_FACE_DETECTION, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS, CameraSettings.KEY_SEE_MORE, CameraSettings.KEY_NOISE_REDUCTION, CameraSettings.KEY_DIS, diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index cac9eb4b6..afb5e8570 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -504,6 +504,9 @@ public class VideoModule implements CameraModule, // Power shutter mActivity.initPowerShutter(mPreferences); + // Max brightness + mActivity.initMaxBrightness(mPreferences); + /* * To reduce startup time, we start the preview in another thread. * We make sure the preview is started at the end of onCreate. @@ -2867,6 +2870,7 @@ public class VideoModule implements CameraModule, mPreferences.getString(CameraSettings.KEY_CAMERA_SAVEPATH, "0").equals("1")); mActivity.updateStorageSpaceAndHint(); mActivity.initPowerShutter(mPreferences); + mActivity.initMaxBrightness(mPreferences); } } |