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

* commit 'db97900feb212930cd9d55577f80918e4427df92': Don't dismiss volume during animation
2015-07-07 17:34:40 +00:00
parent ba31dff14a db97900feb
commit c067bae08d
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;