summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Mertz <scott@cyngn.com>2016-06-01 00:48:09 (GMT)
committerScott Mertz <scott@cyngn.com>2016-06-01 01:06:02 (GMT)
commitd2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2 (patch)
treedd9df8bc15747b3dbefa6bb039e095e1be59ffa3
parent96a82ff4af87f19708112ea5f0d343d6857a1205 (diff)
downloadandroid_packages_apps_Camera2-d2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2.zip
android_packages_apps_Camera2-d2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2.tar.gz
android_packages_apps_Camera2-d2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2.tar.bz2
Camera2: only override power key
Partial revert "Camera2: Use new window manager flag for prevent system keys." CYNGNOS-2958 Change-Id: I3dc95f8b150e673bc9cada437e121ec3ceb46b84
-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 b735594..5ac39bf 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);
}
}