summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-05-31 18:01:53 -0700
committerScott Mertz <scott@cyngn.com>2016-05-31 21:41:19 -0700
commitdf484946c92ca542e6ee68e7567fb14a395832a1 (patch)
treea54a303ed45c88c9367fe55614103e4c358fde9f
parenta5d7ca295ba4849ed72dbe8215cc7a3b35a18006 (diff)
downloadandroid_packages_apps_Snap-df484946c92ca542e6ee68e7567fb14a395832a1.zip
android_packages_apps_Snap-df484946c92ca542e6ee68e7567fb14a395832a1.tar.gz
android_packages_apps_Snap-df484946c92ca542e6ee68e7567fb14a395832a1.tar.bz2
Snap: Only override power key
Partially revert "Snap: Use new window manager flag for prevent system keys." CYNGNOS-2958 Change-Id: I1e726aa77a6db17c8586c19ddc3b9b31b4077194 (cherry picked from commit a0a8d9268fafd21db3c05db76316d2dccb769ab6)
-rw-r--r--src/com/android/camera/CameraActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 05ba232..e6e1ea4 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1795,10 +1795,10 @@ public class CameraActivity extends Activity
}
if (mPowerShutter && mInCameraApp) {
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);
}
}