Merge "[Floaty] Assistant haptics independent of invocation effect" into main (d83a2c44) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -1480,8 +1480,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		break;
		case LONG_PRESS_POWER_ASSISTANT:
		mPowerKeyHandled = true;
		if (!enableLppAssistInvocationHapticEffect()
		&& !enableLppAssistInvocationEffect()) {
		if (!enableLppAssistInvocationEffect()) {
		performHapticFeedback(HapticFeedbackConstants.ASSISTANT_BUTTON,
		"Power - Long Press - Go To Assistant");
		}
		@@ -2571,6 +2570,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (getResolvedLongPressOnPowerBehavior() == LONG_PRESS_POWER_ASSISTANT) {
		handleSingleKeyGestureInKeyGestureController(
		KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT, event);
		if (!enableLppAssistInvocationHapticEffect()
		&& event.getAction() == ACTION_COMPLETE) {
		// The invocation effect will not play haptics so we must play the
		// assistant effect here
		performHapticFeedback(HapticFeedbackConstants.ASSISTANT_BUTTON,
		"Power - Long Press - Go To Assistant");
		}
		return;
		}
		}