Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename KeyboardShortcutsData to KeyboardShortcutsMessage." into sc-v2-dev

Browse Source
This commit is contained in:
Dave Mankoff
2021-08-19 14:06:55 +00:00
committed by Android (Google) Code Review
parent 38e9684d15 485fb3e4b1
commit f90ce119aa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -891,11 +891,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());
@@ -1998,18 +1998,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;
}
}

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

@@ -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