From d2bb13d6d3ba4080eadb5af2d4a1cc22374d25e2 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Tue, 31 May 2016 17:48:09 -0700 Subject: Camera2: only override power key Partial revert "Camera2: Use new window manager flag for prevent system keys." CYNGNOS-2958 Change-Id: I3dc95f8b150e673bc9cada437e121ec3ceb46b84 --- src/com/android/camera/CameraActivity.java | 4 ++-- 1 file 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); } } -- cgit v1.2.3