diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-07 14:34:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 14:34:59 +0000 |
| commit | 46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba (patch) | |
| tree | af06f5374ef29b0fb1b58f2d111831853b86895c | |
| parent | f18ed45faf24fdc45ce7c158d46d8ab25d39a6e3 (diff) | |
| parent | 305e0baa67b4b07b78f6e8fd8b1863ab58776369 (diff) | |
| download | frameworks_base-46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba.zip frameworks_base-46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba.tar.gz frameworks_base-46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba.tar.bz2 | |
Merge "Don't dismiss volume during animation" into mnc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ public class VolumeDialog { } protected void dismissH(int reason) { + if (mMotion.isAnimating()) { + return; + } mHandler.removeMessages(H.DISMISS); mHandler.removeMessages(H.SHOW); if (!mShowing) return; |