commit 1dad272337db57d72d9158dc77f64798810f62e7
author John Spurlock <jspurlock@google.com> Fri Jul 11 11:07:53 2014 -0400
committer John Spurlock <jspurlock@google.com> Fri Jul 11 11:07:53 2014 -0400
tree 5bdd9e2c506682fb69acc8ba19a3239305219ae8
parent d05f67f9721e1f9194a1f57cf7481b4be65366b3

Volume: delay dismissing panel when starting settings.

Bug:16211952
Change-Id: I067721d932076dafb35c6afd99583301acff9bea

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

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index 08216c4..3570257 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -263,7 +263,7 @@
             synchronized (sConfirmSafeVolumeLock) {
                 sConfirmSafeVolumeDialog = null;
             }
-            mVolumePanel.forceTimeout();
+            mVolumePanel.forceTimeout(0);
             mVolumePanel.updateStates();
         }
     }
@@ -293,7 +293,7 @@
                 public boolean onTouchEvent(MotionEvent event) {
                     if (isShowing() && event.getAction() == MotionEvent.ACTION_OUTSIDE &&
                             sConfirmSafeVolumeDialog == null) {
-                        forceTimeout();
+                        forceTimeout(0);
                         return true;
                     }
                     return false;
@@ -718,8 +718,8 @@
         obtainMessage(MSG_DISPLAY_SAFE_VOLUME_WARNING, flags, 0).sendToTarget();
     }
 
-    public void postDismiss() {
-        forceTimeout();
+    public void postDismiss(long delay) {
+        forceTimeout(delay);
     }
 
     public void postLayoutDirection(int layoutDirection) {
@@ -1205,9 +1205,9 @@
         sendEmptyMessage(MSG_USER_ACTIVITY);
     }
 
-    private void forceTimeout() {
+    private void forceTimeout(long delay) {
         removeMessages(MSG_TIMEOUT);
-        sendEmptyMessage(MSG_TIMEOUT);
+        sendEmptyMessageDelayed(MSG_TIMEOUT, delay);
     }
 
     public ZenModeController getZenController() {