From 485fb3e4b10877c2af358d3e96cf18c5a8a50a0a Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Wed, 18 Aug 2021 11:32:52 -0400
Subject: [PATCH] Rename KeyboardShortcutsData to KeyboardShortcutsMessage.

Rename AnimateExpandSettingsPanelData AnimateExpandSettingsPanelMessage.

Bug: 190746471
Test: manual
Change-Id: I4ef9506a937be2479e51be3aa24f3e421069d9b6
---
 .../android/systemui/statusbar/phone/StatusBar.java  | 12 ++++++------
 .../phone/StatusBarCommandQueueCallbacks.java        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 8591e85ff4569..87a7e6e362923 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -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;
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
index a6333f88e7e7d..6a510c92a3a08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarCommandQueueCallbacks.java
@@ -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