diff options
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 36505b132..21481585b 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -199,6 +199,7 @@ public class CameraActivity extends Activity private OnScreenHint mStorageHint; 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; // This is a hack to speed up the start of SecureCamera. @@ -1782,7 +1783,7 @@ public class CameraActivity extends Activity if (!CameraUtil.hasCameraKey()) { mPowerShutter = val.equals(CameraSettings.VALUE_ON); } - if (mPowerShutter /*TODO: && mShowCameraAppView*/) { + if (mPowerShutter && mInCameraApp) { getWindow().addPrivateFlags( WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY); } else { @@ -1814,6 +1815,10 @@ public class CameraActivity extends Activity return mSecureCamera; } + public boolean isInCameraApp() { + return mInCameraApp; + } + @Override public void onModuleSelected(int moduleIndex) { if (mCurrentModuleIndex == moduleIndex) { @@ -2043,6 +2048,10 @@ public class CameraActivity extends Activity */ private void setPreviewControlsVisibility(boolean showControls) { mCurrentModule.onPreviewFocusChanged(showControls); + + // controls are only shown when the camera app is active + // so we can assume to fetch this information from here + mInCameraApp = showControls; } // Accessor methods for getting latency times used in performance testing |