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

* commit 'cd8b462ec4cfc2652346dc3dc8eba3858f9b7c28':
  Don't dismiss volume during animation
This commit is contained in:
Jason Monk
2015-07-07 16:22:20 +00:00
committed by Android Git Automerger

View File

@@ -462,6 +462,9 @@ public class VolumeDialog {
} }
protected void dismissH(int reason) { protected void dismissH(int reason) {
if (mMotion.isAnimating()) {
return;
}
mHandler.removeMessages(H.DISMISS); mHandler.removeMessages(H.DISMISS);
mHandler.removeMessages(H.SHOW); mHandler.removeMessages(H.SHOW);
if (!mShowing) return; if (!mShowing) return;