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 18:15:54 -0700
commit441bfaaf6980196301e8a84e8f628586d9e0e8e5 (patch)
treec23bcbf306dafc8cc969ff69caaa7bd2d684cef3
parent240f1df9a0647cc95e11d5ec3fd524155d3dd21a (diff)
downloadandroid_packages_apps_Snap-441bfaaf6980196301e8a84e8f628586d9e0e8e5.zip
android_packages_apps_Snap-441bfaaf6980196301e8a84e8f628586d9e0e8e5.tar.gz
android_packages_apps_Snap-441bfaaf6980196301e8a84e8f628586d9e0e8e5.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 0f36052..ba79b1c 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1809,10 +1809,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);
}
}