diff options
author | Michael Bestas <mikeioannina@gmail.com> | 2014-10-14 06:21:58 +0300 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:03 +0300 |
commit | 7d9c22ca00a78614afbd79e3785bab7e39ce02c4 (patch) | |
tree | 2bdf6cb7b30022f33b4b211968401f66d0b463bb /src/com/android/camera | |
parent | 335b416fbb319eeaba23e4054e3f98adcc90c99f (diff) | |
download | android_packages_apps_Snap-7d9c22ca00a78614afbd79e3785bab7e39ce02c4.tar.gz android_packages_apps_Snap-7d9c22ca00a78614afbd79e3785bab7e39ce02c4.tar.bz2 android_packages_apps_Snap-7d9c22ca00a78614afbd79e3785bab7e39ce02c4.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/com/android/camera')
-rw-r--r-- | 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 | ||||
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 4 | ||||
-rw-r--r-- | 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 21481585b..71894b82a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -202,6 +202,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; // This is a hack to speed up the start of SecureCamera. private static boolean sFirstStartAfterScreenOn = true; private int mLastRawOrientation; @@ -1792,6 +1794,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 1dde274d2..7db9fec80 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 2d2bc85ca..e5cf7274c 100644 --- a/src/com/android/camera/ComboPreferences.java +++ b/src/com/android/camera/ComboPreferences.java @@ -154,7 +154,8 @@ public class ComboPreferences implements || key.equals(CameraSettings.KEY_TIMER_SOUND_EFFECTS) || key.equals(CameraSettings.KEY_PHOTOSPHERE_PICTURESIZE) || key.equals(CameraSettings.KEY_CAMERA_SAVEPATH) - || 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 0d16c7d36..46ca5cbd5 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -182,7 +182,8 @@ public class PhotoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_FOCUS_MODE, CameraSettings.KEY_REDEYE_REDUCTION, - CameraSettings.KEY_POWER_SHUTTER + CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS }; mOtherKeys2 = new String[] { @@ -200,6 +201,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 8d919b4e3..c8cd0a0da 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -497,6 +497,9 @@ public class PhotoModule // Power shutter mActivity.initPowerShutter(mPreferences); + // Max brightness + mActivity.initMaxBrightness(mPreferences); + if (mOpenCameraThread == null) { mOpenCameraThread = new OpenCameraThread(); mOpenCameraThread.start(); @@ -2322,6 +2325,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); @@ -4224,6 +4230,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 bfce0db69..08491a6fb 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -115,7 +115,8 @@ public class VideoMenu extends MenuController CameraSettings.KEY_EXPOSURE, CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, - CameraSettings.KEY_POWER_SHUTTER + CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS }; mOtherKeys2 = new String[] { CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE, @@ -126,6 +127,7 @@ public class VideoMenu extends MenuController CameraSettings.KEY_WHITE_BALANCE, CameraSettings.KEY_VIDEO_HIGH_FRAME_RATE, CameraSettings.KEY_POWER_SHUTTER, + CameraSettings.KEY_MAX_BRIGHTNESS, CameraSettings.KEY_SEE_MORE, CameraSettings.KEY_DIS, CameraSettings.KEY_VIDEO_EFFECT, diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 038d0d60a..fadd3ee6e 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -443,6 +443,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. @@ -2542,6 +2545,7 @@ public class VideoModule implements CameraModule, mPreferences.getString(CameraSettings.KEY_CAMERA_SAVEPATH, "0").equals("1")); mActivity.updateStorageSpaceAndHint(); mActivity.initPowerShutter(mPreferences); + mActivity.initMaxBrightness(mPreferences); } } |