Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 312322a2 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Fix: LAUNCH_VOICE_ASSISTANT gesture should launch assistant" into main

parents a6a88a4e ec361ef6

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

+2 −0
Original line number Diff line number Diff line
@@ -4081,6 +4081,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    case KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_APP_SWITCH:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_HOME:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_SYSTEM_SETTINGS:

                    case KeyGestureEvent.KEY_GESTURE_TYPE_LOCK_SCREEN:
@@ -4164,6 +4165,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

                return true;

            case KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT:

            case KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT:

                if (complete) {

                    launchAssistAction(Intent.EXTRA_ASSIST_INPUT_HINT_KEYBOARD,

                            deviceId, SystemClock.uptimeMillis(),

services/tests/wmtests/src/com/android/server/policy/KeyGestureEventTests.java

+8 −0
Original line number Diff line number Diff line
@@ -467,6 +467,14 @@ public class KeyGestureEventTests extends ShortcutKeyTestBase { 
        mPhoneWindowManager.assertSearchManagerLaunchAssist();

    }



    @Test

    public void testKeyGestureLaunchVoiceAssistant() {

        Assert.assertTrue(

                sendKeyGestureEventComplete(

                        KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT));

        mPhoneWindowManager.assertSearchManagerLaunchAssist();

    }



    @Test

    public void testKeyGestureGoHome() {

        Assert.assertTrue(