Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev (e45c4e42) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -447,6 +447,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// Screenshot trigger states
		// Time to volume and power must be pressed within this interval of each other.
		private static final long SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS = 150;
		// Increase the chord delay when taking a screenshot from the keyguard
		private static final float KEYGUARD_SCREENSHOT_CHORD_DELAY_MULTIPLIER = 2.5f;
		private boolean mScreenshotChordEnabled;
		private boolean mVolumeDownKeyTriggered;
		private long mVolumeDownKeyTime;
		@@ -669,10 +671,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mVolumeDownKeyConsumedByScreenshotChord = true;
		cancelPendingPowerKeyAction();

		mHandler.postDelayed(mScreenshotChordLongPress,
		ViewConfiguration.getGlobalActionKeyTimeout());
		mHandler.postDelayed(mScreenshotChordLongPress, getScreenshotChordLongPressDelay());
		}
		}
		}

		private long getScreenshotChordLongPressDelay() {
		if (mKeyguardMediator.isShowing()) {
		// Double the time it takes to take a screenshot from the keyguard
		return (long) (KEYGUARD_SCREENSHOT_CHORD_DELAY_MULTIPLIER *
		ViewConfiguration.getGlobalActionKeyTimeout());
		} else {
		return ViewConfiguration.getGlobalActionKeyTimeout();
		}
		}

		private void cancelPendingScreenshotChordAction() {