| commit | 46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Jul 07 14:34:58 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 07 14:34:59 2015 +0000 |
| tree | af06f5374ef29b0fb1b58f2d111831853b86895c | |
| parent | f18ed45faf24fdc45ce7c158d46d8ab25d39a6e3 [diff] | |
| parent | 305e0baa67b4b07b78f6e8fd8b1863ab58776369 [diff] |
Merge "Don't dismiss volume during animation" into mnc-dev
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 3964820..a4ccfd1 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -462,6 +462,9 @@ } protected void dismissH(int reason) { + if (mMotion.isAnimating()) { + return; + } mHandler.removeMessages(H.DISMISS); mHandler.removeMessages(H.SHOW); if (!mShowing) return;