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

Commit 485fb3e4 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Rename KeyboardShortcutsData to KeyboardShortcutsMessage. 

Rename AnimateExpandSettingsPanelData AnimateExpandSettingsPanelMessage.

Bug: 190746471
Test: manual
Change-Id: I4ef9506a937be2479e51be3aa24f3e421069d9b6
parent 9728e603

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

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

        DateTimeView.setReceiverHandler(timeTickHandler);



        mMessageRouter.subscribeTo(KeyboardShortcutsData.class,

        mMessageRouter.subscribeTo(KeyboardShortcutsMessage.class,

                data -> toggleKeyboardShortcuts(data.mDeviceId));

        mMessageRouter.subscribeTo(MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU,

                id -> dismissKeyboardShortcuts());

        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelData.class,

        mMessageRouter.subscribeTo(AnimateExpandSettingsPanelMessage.class,

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

        mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,

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

    }



    static class KeyboardShortcutsData {

    static class KeyboardShortcutsMessage {

        final int mDeviceId;



        KeyboardShortcutsData(int deviceId) {

        KeyboardShortcutsMessage(int deviceId) {

            mDeviceId = deviceId;

        }

    }



    static class AnimateExpandSettingsPanelData {

    static class AnimateExpandSettingsPanelMessage {

        final String mSubpanel;



        AnimateExpandSettingsPanelData(String subpanel) {

        AnimateExpandSettingsPanelMessage(String subpanel) {

            mSubpanel = subpanel;

        }

    }

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

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


    @Override

    public void toggleKeyboardShortcutsMenu(int deviceId) {

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

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

    }



    @Override