Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (c77d7921) · Commits · e / os / android_frameworks_base

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

+37 −23

Original line number	Diff line number	Diff line
		@@ -584,6 +584,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		private ActivityTaskManagerInternal.SleepTokenAcquirer mScreenOffSleepTokenAcquirer;
		boolean mMenuPressed;
		boolean mAssistPressed;
		boolean mAppSwitchLongPressed;
		Intent mHomeIntent;
		Intent mCarDockIntent;
		@@ -3377,7 +3378,38 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		break;
		case KeyEvent.KEYCODE_ASSIST:
		Slog.wtf(TAG, "KEYCODE_ASSIST should be handled in interceptKeyBeforeQueueing");
		if (keyguardOn) {
		break;
		}
		if (down) {
		if (mAssistPressAction == Action.APP_SWITCH
		\|\| mAssistLongPressAction == Action.APP_SWITCH) {
		preloadRecentApps();
		}
		if (repeatCount == 0) {
		mAssistPressed = true;
		} else if (longPress) {
		if (mAssistLongPressAction != Action.NOTHING) {
		if (mAssistLongPressAction != Action.APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
		"Assist - Long Press");
		performKeyAction(mAssistLongPressAction, event);
		mAssistPressed = false;
		}
		}
		} else {
		if (mAssistPressed) {
		if (mAssistPressAction != Action.APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		mAssistPressed = false;
		if (!canceled) {
		performKeyAction(mAssistPressAction, event);
		}
		}
		}
		return key_consumed;
		case KeyEvent.KEYCODE_VOICE_ASSIST:
		Slog.wtf(TAG, "KEYCODE_VOICE_ASSIST should be handled in"
		@@ -4720,30 +4752,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		break;
		}
		case KeyEvent.KEYCODE_ASSIST: {
		final boolean longPressed = event.getRepeatCount() > 0;
		if (down && (mAssistPressAction == Action.APP_SWITCH
		\|\| mAssistLongPressAction == Action.APP_SWITCH)) {
		preloadRecentApps();
		}
		if (down && longPressed) {
		if (!keyguardOn() && mAssistLongPressAction != Action.NOTHING) {
		if (mAssistLongPressAction != Action.APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, false,
		"Assist - Long Press");
		performKeyAction(mAssistLongPressAction, event);
		}
		}
		if (!down && !longPressed) {
		if (mAssistPressAction != Action.APP_SWITCH) {
		cancelPreloadRecentApps();
		}
		if (!canceled) {
		performKeyAction(mAssistPressAction, event);
		if (down && !interactive) {
		isWakeKey = mWakeOnAssistKeyPress;
		if (!isWakeKey) {
		useHapticFeedback = false;
		}
		}
		result &= ~ACTION_PASS_TO_USER;
		break;
		}
		case KeyEvent.KEYCODE_VOICE_ASSIST: {