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

Commit 5b25b31a authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Toggle notifications panel via actions shortcut" into udc-dev am: df01fc84 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21547861



Change-Id: I3438a6b4551cf64102a69c2a0fb442f63e81b8d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c360426 df01fc84

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

+2 −9
Original line number Diff line number Diff line
@@ -2978,16 +2978,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                break;

            case KeyEvent.KEYCODE_N:

                if (down && event.isMetaPressed()) {

                    IStatusBarService service = getStatusBarService();

                    if (service != null) {

                        try {

                            service.expandNotificationsPanel();

                        } catch (RemoteException e) {

                            // do nothing.

                        }

                    toggleNotificationPanel();

                    return key_consumed;

                }

                }

                break;

            case KeyEvent.KEYCODE_S:

                if (down && event.isMetaPressed() && event.isCtrlPressed() && repeatCount == 0) {

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

+2 −2
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ public class ModifierShortcutTests extends ShortcutKeyTestBase { 
     */

    @Test

    public void testMetaN() throws RemoteException {

        mPhoneWindowManager.overrideExpandNotificationsPanel();

        mPhoneWindowManager.overrideTogglePanel();

        sendKeyCombination(new int[]{KEYCODE_META_LEFT, KEYCODE_N}, 0);

        mPhoneWindowManager.assertExpandNotification();

        mPhoneWindowManager.assertTogglePanel();

    }



    /**

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

+4 −4
Original line number Diff line number Diff line
@@ -322,12 +322,12 @@ class TestPhoneWindowManager { 
        doReturn(true).when(mTelecomManager).endCall();

    }



    void overrideExpandNotificationsPanel() {

    void overrideTogglePanel() {

        // Can't directly mock on IStatusbarService, use spyOn and override the specific api.

        mPhoneWindowManager.getStatusBarService();

        spyOn(mPhoneWindowManager.mStatusBarService);

        try {

            doNothing().when(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel();

            doNothing().when(mPhoneWindowManager.mStatusBarService).togglePanel();

        } catch (RemoteException e) {

            e.printStackTrace();

        }
@@ -428,9 +428,9 @@ class TestPhoneWindowManager { 
        Assert.assertTrue(intentCaptor.getValue().getAction() == Intent.ACTION_BUG_REPORT);

    }



    void assertExpandNotification() throws RemoteException {

    void assertTogglePanel() throws RemoteException {

        waitForIdle();

        verify(mPhoneWindowManager.mStatusBarService).expandNotificationsPanel();

        verify(mPhoneWindowManager.mStatusBarService).togglePanel();

    }



    void assertToggleShortcutsMenu() {