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

* commit 'cd8b462ec4cfc2652346dc3dc8eba3858f9b7c28': Don't dismiss volume during animation
2015-07-07 16:22:20 +00:00
parent 43d88d9a65 cd8b462ec4
commit db97900feb
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;