commit ad494bc0e427e90e6ce4cfce382b4a5134fc8b91
author John Spurlock <jspurlock@google.com> Sat Jul 19 15:56:19 2014 -0400
committer John Spurlock <jspurlock@google.com> Sun Jul 20 17:39:44 2014 -0400
tree d55595a12842558aaf256216033b45f7503f752e
parent 7226b9b62d9c26eda9e2353e8ce35808e51c3fd3

Volume: Remove silent mode icon.

Instead of changing the slider icon and state in silent mode,
maintain the previous state, but disable.

Add VolumePanel to sysui dumpstate.

Bug:16209908
Change-Id: If9730b51ae9190e1ace5888d92a6ab5ce241f8f2

packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
index d3f4db6..9d050f9 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
@@ -24,6 +24,9 @@
 import com.android.systemui.statusbar.policy.ZenModeController;
 import com.android.systemui.statusbar.policy.ZenModeControllerImpl;
 
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
 /*
  * Copyright (C) 2014 The Android Open Source Project
  *
@@ -53,7 +56,6 @@
     private VolumeController mVolumeController;
     private RemoteVolumeController mRemoteVolumeController;
 
-    private VolumePanel mDialogPanel;
     private VolumePanel mPanel;
     private int mDismissDelay;
 
@@ -70,6 +72,13 @@
         mContext.getContentResolver().registerContentObserver(SETTING_URI, false, mObserver);
     }
 
+    @Override
+    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+        if (mPanel != null) {
+            mPanel.dump(fd, pw, args);
+        }
+    }
+
     private void updateController() {
         if (Settings.Global.getInt(mContext.getContentResolver(), SETTING, DEFAULT) != 0) {
             Log.d(TAG, "Registering volume controller");
@@ -107,7 +116,6 @@
                 }
             }
         });
-        mDialogPanel = mPanel;
     }
 
     private final ContentObserver mObserver = new ContentObserver(mHandler) {
@@ -137,7 +145,7 @@
                     mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
                 }
             });
-            mDialogPanel.postDismiss(mDismissDelay);
+            mPanel.postDismiss(mDismissDelay);
         }
     };
 
@@ -178,12 +186,7 @@
 
         @Override
         public ZenModeController getZenController() {
-            return mDialogPanel.getZenController();
-        }
-
-        @Override
-        public void setVolumePanel(VolumePanel panel) {
-            mPanel = panel == null ? mDialogPanel : panel;
+            return mPanel.getZenController();
         }
     }