Merge remote-tracking branch 'origin/lineage-17.1' into v1-q (26d9dba2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -552,6 +552,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		boolean mVolumeAnswerCall;

		// Click volume down + power for partial screenshot
		boolean mClickPartialScreenshot;

		private boolean mPendingKeyguardOccluded;
		private boolean mKeyguardOccludedChanged;
		private boolean mNotifyUserActivity;
		@@ -961,6 +964,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		resolver.registerContentObserver(LineageSettings.System.getUriFor(
		LineageSettings.System.VOLUME_ANSWER_CALL), false, this,
		UserHandle.USER_ALL);
		resolver.registerContentObserver(LineageSettings.System.getUriFor(
		LineageSettings.System.CLICK_PARTIAL_SCREENSHOT), false, this,
		UserHandle.USER_ALL);

		updateSettings();
		}
		@@ -2451,6 +2457,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mCameraLaunch = LineageSettings.System.getIntForUser(resolver,
		LineageSettings.System.CAMERA_LAUNCH, 0,
		UserHandle.USER_CURRENT) == 1;
		mClickPartialScreenshot = LineageSettings.System.getIntForUser(resolver,
		LineageSettings.System.CLICK_PARTIAL_SCREENSHOT, 0,
		UserHandle.USER_CURRENT) == 1;

		// Configure wake gesture.
		boolean wakeGestureEnabledSetting = Settings.Secure.getIntForUser(resolver,
		@@ -4411,6 +4420,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mScreenshotChordVolumeDownKeyTriggered = false;
		cancelPendingScreenshotChordAction();
		cancelPendingAccessibilityShortcutAction();

		if (mClickPartialScreenshot && mScreenshotChordVolumeDownKeyConsumed) {
		mScreenshotRunnable.setScreenshotType(TAKE_SCREENSHOT_SELECTED_REGION);
		mHandler.post(mScreenshotRunnable);
		}
		}
		} else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
		if (down) {