Cleanup internal status bar APIs.

IStatusBarService.collapseQuickSettings is gone;
collapseNotifications is now collapsePanels, which does what
collapse() used to do. Similarly,
IStatusBar.animateCollapseQuickSettings is now simply
IStatusBar.animateCollapse().

Bug: 7245229
Change-Id: Id157d2fdf34926d3c85ffa8b81c741a5359aede4

1 files changed, 25 insertions, 37 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index 39e49b8..752bb0c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -46,17 +46,16 @@ public class CommandQueue extends IStatusBar.Stub {
     private static final int MSG_REMOVE_NOTIFICATION        = 4 << MSG_SHIFT;
     private static final int MSG_DISABLE                    = 5 << MSG_SHIFT;
     private static final int MSG_EXPAND_NOTIFICATIONS       = 6 << MSG_SHIFT;
-    private static final int MSG_COLLAPSE_NOTIFICATIONS     = 7 << MSG_SHIFT;
-    private static final int MSG_EXPAND_QUICK_SETTINGS      = 8 << MSG_SHIFT;
-    private static final int MSG_COLLAPSE_QUICK_SETTINGS    = 9 << MSG_SHIFT;
-    private static final int MSG_SET_SYSTEMUI_VISIBILITY    = 10 << MSG_SHIFT;
-    private static final int MSG_TOP_APP_WINDOW_CHANGED     = 11 << MSG_SHIFT;
-    private static final int MSG_SHOW_IME_BUTTON            = 12 << MSG_SHIFT;
-    private static final int MSG_SET_HARD_KEYBOARD_STATUS   = 13 << MSG_SHIFT;
-    private static final int MSG_TOGGLE_RECENT_APPS         = 14 << MSG_SHIFT;
-    private static final int MSG_PRELOAD_RECENT_APPS        = 15 << MSG_SHIFT;
-    private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 16 << MSG_SHIFT;
-    private static final int MSG_SET_NAVIGATION_ICON_HINTS  = 17 << MSG_SHIFT;
+    private static final int MSG_COLLAPSE_PANELS            = 7 << MSG_SHIFT;
+    private static final int MSG_EXPAND_SETTINGS            = 8 << MSG_SHIFT;
+    private static final int MSG_SET_SYSTEMUI_VISIBILITY    = 9 << MSG_SHIFT;
+    private static final int MSG_TOP_APP_WINDOW_CHANGED     = 10 << MSG_SHIFT;
+    private static final int MSG_SHOW_IME_BUTTON            = 11 << MSG_SHIFT;
+    private static final int MSG_SET_HARD_KEYBOARD_STATUS   = 12 << MSG_SHIFT;
+    private static final int MSG_TOGGLE_RECENT_APPS         = 13 << MSG_SHIFT;
+    private static final int MSG_PRELOAD_RECENT_APPS        = 14 << MSG_SHIFT;
+    private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 15 << MSG_SHIFT;
+    private static final int MSG_SET_NAVIGATION_ICON_HINTS  = 16 << MSG_SHIFT;
 
     public static final int FLAG_EXCLUDE_NONE = 0;
     public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -86,10 +85,9 @@ public class CommandQueue extends IStatusBar.Stub {
         public void updateNotification(IBinder key, StatusBarNotification notification);
         public void removeNotification(IBinder key);
         public void disable(int state);
-        public void animateExpandNotifications();
-        public void animateCollapseNotifications(int flags);
-        public void animateExpandQuickSettings();
-        public void animateCollapseQuickSettings();
+        public void animateExpandNotificationsPanel();
+        public void animateCollapsePanels(int flags);
+        public void animateExpandSettingsPanel();
         public void setSystemUiVisibility(int vis, int mask);
         public void topAppWindowChanged(boolean visible);
         public void setImeWindowStatus(IBinder token, int vis, int backDisposition);
@@ -154,31 +152,24 @@ public class CommandQueue extends IStatusBar.Stub {
         }
     }
 
-    public void animateExpandNotifications() {
+    public void animateExpandNotificationsPanel() {
         synchronized (mList) {
             mHandler.removeMessages(MSG_EXPAND_NOTIFICATIONS);
             mHandler.sendEmptyMessage(MSG_EXPAND_NOTIFICATIONS);
         }
     }
 
-    public void animateCollapseNotifications() {
+    public void animateCollapsePanels() {
         synchronized (mList) {
-            mHandler.removeMessages(MSG_COLLAPSE_NOTIFICATIONS);
-            mHandler.sendEmptyMessage(MSG_COLLAPSE_NOTIFICATIONS);
+            mHandler.removeMessages(MSG_COLLAPSE_PANELS);
+            mHandler.sendEmptyMessage(MSG_COLLAPSE_PANELS);
         }
     }
 
-    public void animateExpandQuickSettings() {
+    public void animateExpandSettingsPanel() {
         synchronized (mList) {
-            mHandler.removeMessages(MSG_EXPAND_QUICK_SETTINGS);
-            mHandler.sendEmptyMessage(MSG_EXPAND_QUICK_SETTINGS);
-        }
-    }
-
-    public void animateCollapseQuickSettings() {
-        synchronized (mList) {
-            mHandler.removeMessages(MSG_COLLAPSE_QUICK_SETTINGS);
-            mHandler.sendEmptyMessage(MSG_COLLAPSE_QUICK_SETTINGS);
+            mHandler.removeMessages(MSG_EXPAND_SETTINGS);
+            mHandler.sendEmptyMessage(MSG_EXPAND_SETTINGS);
         }
     }
 
@@ -289,16 +280,13 @@ public class CommandQueue extends IStatusBar.Stub {
                     mCallbacks.disable(msg.arg1);
                     break;
                 case MSG_EXPAND_NOTIFICATIONS:
-                    mCallbacks.animateExpandNotifications();
-                    break;
-                case MSG_COLLAPSE_NOTIFICATIONS:
-                    mCallbacks.animateCollapseNotifications(0);
+                    mCallbacks.animateExpandNotificationsPanel();
                     break;
-                case MSG_EXPAND_QUICK_SETTINGS:
-                    mCallbacks.animateExpandQuickSettings();
+                case MSG_COLLAPSE_PANELS:
+                    mCallbacks.animateCollapsePanels(0);
                     break;
-                case MSG_COLLAPSE_QUICK_SETTINGS:
-                    mCallbacks.animateCollapseQuickSettings();
+                case MSG_EXPAND_SETTINGS:
+                    mCallbacks.animateExpandSettingsPanel();
                     break;
                 case MSG_SET_SYSTEMUI_VISIBILITY:
                     mCallbacks.setSystemUiVisibility(msg.arg1, msg.arg2);