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, 9 insertions, 24 deletions

diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 1e61e106d75c..3d656c7cf097 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -97,13 +97,13 @@ public class StatusBarManager {
     }
     
     /**
-     * Expand the notifications.
+     * Expand the notifications panel.
      */
-    public void expandNotifications() {
+    public void expandNotificationsPanel() {
         try {
             final IStatusBarService svc = getService();
             if (svc != null) {
-                svc.expandNotifications();
+                svc.expandNotificationsPanel();
             }
         } catch (RemoteException ex) {
             // system process is dead anyway.
@@ -112,13 +112,13 @@ public class StatusBarManager {
     }
     
     /**
-     * Collapse the notifications.
+     * Collapse the notifications and settings panels.
      */
-    public void collapseNotifications() {
+    public void collapsePanels() {
         try {
             final IStatusBarService svc = getService();
             if (svc != null) {
-                svc.collapseNotifications();
+                svc.collapsePanels();
             }
         } catch (RemoteException ex) {
             // system process is dead anyway.
@@ -127,28 +127,13 @@ public class StatusBarManager {
     }
 
     /**
-     * Expand the quick settings.
+     * Expand the settings panel.
      */
-    public void expandQuickSettings() {
+    public void expandSettingsPanel() {
         try {
             final IStatusBarService svc = getService();
             if (svc != null) {
-                svc.expandQuickSettings();
-            }
-        } catch (RemoteException ex) {
-            // system process is dead anyway.
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /**
-     * Collapse the quick settings.
-     */
-    public void collapseQuickSettings() {
-        try {
-            final IStatusBarService svc = getService();
-            if (svc != null) {
-                svc.collapseQuickSettings();
+                svc.expandSettingsPanel();
             }
         } catch (RemoteException ex) {
             // system process is dead anyway.