commit 4c311138c5facbf70621bca198da2a05adfac02c
author Jian-Yang Liu <jianyliu@google.com> Mon Oct 21 11:17:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 21 11:17:15 2019 -0700
tree 1db0859c5ec5a462ddb7a2519ed8bc589e7cc200
parent d5cb604a811b8ab9ce701c702ac2649df66e4e54
parent 7006565a525eeddeb51604627442f28dc14a2e5c

Merge "Do not cancel car volume dialog dismiss anim" into qt-qpr1-dev
am: 7006565a52

Change-Id: I00c49bcd2bbd99893f88340f8ab5ed1d2c76e2da

packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java

diff --git a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
index d0a63f0..22c7c7a 100644
--- a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
+++ b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
@@ -143,6 +143,7 @@
     private boolean mHovering;
     private int mCurrentlyDisplayingGroupId;
     private boolean mShowing;
+    private boolean mDismissing;
     private boolean mExpanded;
     private View mExpandIcon;
     private final ServiceConnection mServiceConnection = new ServiceConnection() {
@@ -244,6 +245,7 @@
 
         mHovering = false;
         mShowing = false;
+        mDismissing = false;
         mExpanded = false;
         mWindow = mDialog.getWindow();
         mWindow.requestFeature(Window.FEATURE_NO_TITLE);
@@ -335,14 +337,11 @@
 
         mHandler.removeMessages(H.DISMISS);
         mHandler.removeMessages(H.SHOW);
-        if (!mShowing) {
+        if (!mShowing || mDismissing) {
             return;
         }
 
-        mListView.animate().cancel();
-
-        mListView.setTranslationY(0);
-        mListView.setAlpha(1);
+        mDismissing = true;
         mListView.animate()
                 .alpha(0)
                 .translationY(-mListView.getHeight())
@@ -354,7 +353,7 @@
                     }
                     mDialog.dismiss();
                     mShowing = false;
-                    mShowing = false;
+                    mDismissing = false;
                     // if mExpandIcon is null that means user never clicked on the expanded arrow
                     // which implies that the dialog is still not expanded. In that case we do
                     // not want to reset the state