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

Commit ae9131c3 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Rename KeyboardShortcutsData to KeyboardShortcutsMessage." into... 

Merge "Rename KeyboardShortcutsData to KeyboardShortcutsMessage." into sc-v2-dev am: f90ce119 am: a5c7c0f8

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

Change-Id: Iafa6e7c5d9e9a87e2fba9e91f829f1ccfa448681
parents 96a83461 a5c7c0f8

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -891,11 +891,11 @@ public class StatusBar extends SystemUI implements 
        // TODO(b/190746471): Find a better home for this.

        // TODO(b/190746471): Find a better home for this.

        DateTimeView.setReceiverHandler(timeTickHandler);

        DateTimeView.setReceiverHandler(timeTickHandler);





        mMessageRouter.subscribeTo(KeyboardShortcutsData.class,

        mMessageRouter.subscribeTo(KeyboardShortcutsMessage.class,

                data -> toggleKeyboardShortcuts(data.mDeviceId));

                data -> toggleKeyboardShortcuts(data.mDeviceId));

        mMessageRouter.subscribeTo(MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU,

        mMessageRouter.subscribeTo(MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU,

                id -> dismissKeyboardShortcuts());

                id -> dismissKeyboardShortcuts());

        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelData.class,

        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelMessage.class,

                data -> mCommandQueueCallbacks.animateExpandSettingsPanel(data.mSubpanel));

                data -> mCommandQueueCallbacks.animateExpandSettingsPanel(data.mSubpanel));

        mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,

        mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,

                id -> onLaunchTransitionTimeout());

                id -> onLaunchTransitionTimeout());
@@ -2009,18 +2009,18 @@ public class StatusBar extends SystemUI implements 
        mState = state;

        mState = state;

    }

    }





    static class KeyboardShortcutsData {

    static class KeyboardShortcutsMessage {

        final int mDeviceId;

        final int mDeviceId;





        KeyboardShortcutsData(int deviceId) {

        KeyboardShortcutsMessage(int deviceId) {

            mDeviceId = deviceId;

            mDeviceId = deviceId;

        }

        }

    }

    }





    static class AnimateExpandSettingsPanelData {

    static class AnimateExpandSettingsPanelMessage {

        final String mSubpanel;

        final String mSubpanel;





        AnimateExpandSettingsPanelData(String subpanel) {

        AnimateExpandSettingsPanelMessage(String subpanel) {

            mSubpanel = subpanel;

            mSubpanel = subpanel;

        }

        }

    }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -527,7 +527,7 @@ public class StatusBarCommandQueueCallbacks implements CommandQueue.Callbacks { 




    @Override

    @Override

    public void toggleKeyboardShortcutsMenu(int deviceId) {

    public void toggleKeyboardShortcutsMenu(int deviceId) {

        mStatusBar.resendMessage(new StatusBar.KeyboardShortcutsData(deviceId));

        mStatusBar.resendMessage(new StatusBar.KeyboardShortcutsMessage(deviceId));

    }

    }





    @Override

    @Override