diff options
| author | Scott Mertz <scott@cyngn.com> | 2016-05-31 17:48:09 -0700 |
|---|---|---|
| committer | Scott Mertz <scott@cyngn.com> | 2016-05-31 18:15:42 -0700 |
| commit | de4a14bf2a3421a5f3f516727ce77121e435295e (patch) | |
| tree | 35846363a9277f42ba5dba2aa1ac75cd6442a695 | |
| parent | 101676fdb71cf0657416c2742d885bdd50e85726 (diff) | |
| download | android_packages_apps_Camera2-de4a14bf2a3421a5f3f516727ce77121e435295e.tar.gz android_packages_apps_Camera2-de4a14bf2a3421a5f3f516727ce77121e435295e.tar.bz2 android_packages_apps_Camera2-de4a14bf2a3421a5f3f516727ce77121e435295e.zip | |
Camera2: only override power key
Partial revert "Camera2: Use new window manager flag for prevent system keys."
CYNGNOS-2958
Change-Id: I3dc95f8b150e673bc9cada437e121ec3ceb46b84
(cherry picked from commit d2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2)
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b73559469..5ac39bf24 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -2251,10 +2251,10 @@ public class CameraActivity extends QuickActivity mPowerShutter = Keys.isPowerShutterOn(mSettingsManager); if (mPowerShutter) { getWindow().addPrivateFlags( - WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS); + WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY); } else { getWindow().clearPrivateFlags( - WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS); + WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY); } } |