am 87b86a2d: am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev

* commit '87b86a2d5418e23f858393f1f074f07a06e9b981': Don't dismiss volume during animation
2015-07-07 16:07:19 +00:00
parent 63138aedc7 87b86a2d54
commit cd8b462ec4
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -462,6 +462,9 @@ public class VolumeDialog {
    }

    protected void dismissH(int reason) {
+        if (mMotion.isAnimating()) {
+            return;
+        }
        mHandler.removeMessages(H.DISMISS);
        mHandler.removeMessages(H.SHOW);
        if (!mShowing) return;