diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2017-02-09 17:13:08 +0100 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-11 01:44:01 +0000 |
| commit | 7cd1d08c2dfd1b7e644793feb3b666acaae30aca (patch) | |
| tree | da4ca61a42237dbc130df040497002b9b565aaff | |
| parent | bb7712ea9d36fcbeca9585b920fd20fcaa496105 (diff) | |
| download | android_packages_apps_Snap-7cd1d08c2dfd1b7e644793feb3b666acaae30aca.tar.gz android_packages_apps_Snap-7cd1d08c2dfd1b7e644793feb3b666acaae30aca.tar.bz2 android_packages_apps_Snap-7cd1d08c2dfd1b7e644793feb3b666acaae30aca.zip | |
Snap: Fix max brightness and power shutter settings
Checking the value of arePreviewControlsVisible() doesn't allow
to reliably determine whether we are using the app or not, so
do it as we used to: set a local flag as soon as we show/hide
the controls and check its value.
Change-Id: Iadfa86d49b74bc811006e1b477b60fc487772219
(cherry picked from commit fe100c6e50feeda676ec470e70c90621dbc57585)
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index d285b4741..cce365ebc 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -217,6 +217,7 @@ public class CameraActivity extends Activity private final Object mStorageSpaceLock = new Object(); private long mStorageSpaceBytes = Storage.LOW_STORAGE_THRESHOLD_BYTES; private boolean mSecureCamera; + private boolean mInCameraApp = true; // Keep track of powershutter state public static boolean mPowerShutter = false; // Keep track of max brightness state @@ -1955,7 +1956,7 @@ public class CameraActivity extends Activity if (!CameraUtil.hasCameraKey()) { mPowerShutter = val.equals(CameraSettings.VALUE_ON); } - if (mPowerShutter && arePreviewControlsVisible()) { + if (mPowerShutter && mInCameraApp) { getWindow().addPrivateFlags( WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY); } else { @@ -1973,7 +1974,7 @@ public class CameraActivity extends Activity mMaxBrightness = val.equals(CameraSettings.VALUE_ON); - if (mMaxBrightness && arePreviewControlsVisible()) { + if (mMaxBrightness && mInCameraApp) { params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL; } else { params.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE; @@ -2388,6 +2389,7 @@ public class CameraActivity extends Activity */ private void setPreviewControlsVisibility(boolean visible) { mCurrentModule.onPreviewFocusChanged(visible); + mInCameraApp = visible; } // Accessor methods for getting latency times used in performance testing |