Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not cancel car volume dialog dismiss anim

Browse Source 
A burst of ACTION_OUTSIDE events would cause the dialog
dismiss animation to repeatedly cancel and restart before
it could finish.

Add a flag to keep track of the dismissing state, and let
the animation finish once it has started.

Change made based on proposal from partner.

Bug: 142877093
Test: manual
Change-Id: I16a76bd7a65313027751f8f0e223d0346626c37b
(cherry picked from commit c8d3ef17af781731b558302efada5c1e7bebd096)
This commit is contained in:
JianYang Liu
2019-10-15 15:38:50 -07:00
committed by Jian-Yang Liu
parent dadd2112f0
commit ffe020a093
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
View File

@@ -143,6 +143,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
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 @@ public class CarVolumeDialogImpl implements VolumeDialog {
mHovering = false;
mShowing = false;
mDismissing = false;
mExpanded = false;
mWindow = mDialog.getWindow();
mWindow.requestFeature(Window.FEATURE_NO_TITLE);
@@ -335,14 +337,11 @@ public class CarVolumeDialogImpl implements VolumeDialog {
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 @@ public class CarVolumeDialogImpl implements VolumeDialog {
}
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