Merge "Rename KeyboardShortcutsData to KeyboardShortcutsMessage." into sc-v2-dev (f90ce119) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

+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