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

Commit 008555ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't subscribe to KEY_GESTURE_TYPE_RECENT_APPS[_SWITCHER] in PhoneWindowManager" into main

parents d6c0959f 893918c4

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

+2 −2
Original line number Diff line number Diff line
@@ -3382,7 +3382,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @SuppressLint("MissingPermission")

    private void initKeyGestures() {

        List<Integer> supportedGestures = new ArrayList<>(List.of(

                KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,

                KeyGestureEvent.KEY_GESTURE_TYPE_APP_SWITCH,

                KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_ASSISTANT,

                KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_VOICE_ASSISTANT,
@@ -3399,7 +3398,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_SHORTCUT_HELPER,

                KeyGestureEvent.KEY_GESTURE_TYPE_BRIGHTNESS_UP,

                KeyGestureEvent.KEY_GESTURE_TYPE_BRIGHTNESS_DOWN,

                KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER,

                KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_SEARCH,

                KeyGestureEvent.KEY_GESTURE_TYPE_LANGUAGE_SWITCH,

                KeyGestureEvent.KEY_GESTURE_TYPE_CLOSE_ALL_DIALOGS,
@@ -3423,6 +3421,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            // When enableKeyGestureHandlerForRecents is enabled, the event is handled in the

            // recents app.

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS);

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS);

            supportedGestures.add(KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER);

        }

        mInputManager.registerKeyGestureEventHandler(supportedGestures,

                PhoneWindowManager.this::handleKeyGestureEvent);

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

+8 −4
Original line number Diff line number Diff line
@@ -441,8 +441,10 @@ public class PhoneWindowManagerTests { 
                List.class);

        verify(mInputManager).registerKeyGestureEventHandler(registeredKeyGestureEvents.capture(),

                any());

        assertThat(registeredKeyGestureEvents.getValue()).doesNotContain(

                KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS);

        assertThat(registeredKeyGestureEvents.getValue()).containsNoneIn(

                List.of(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS,

                        KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,

                        KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER));

    }



    @Test
@@ -454,8 +456,10 @@ public class PhoneWindowManagerTests { 
                List.class);

        verify(mInputManager).registerKeyGestureEventHandler(registeredKeyGestureEvents.capture(),

                any());

        assertThat(registeredKeyGestureEvents.getValue()).contains(

                KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS);

        assertThat(registeredKeyGestureEvents.getValue()).containsAtLeastElementsIn(

                List.of(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS,

                        KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS,

                        KeyGestureEvent.KEY_GESTURE_TYPE_RECENT_APPS_SWITCHER));

    }



    private void initPhoneWindowManager() {