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

Merge "Fix customizer state" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-08 18:46:17 +00:00
committed by Android (Google) Code Review
parent 5c25605da0 edf7483fdf
commit 3aa9980879
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
View File

@@ -104,4 +104,13 @@ public class QSDetailClipper {
public void showBackground() { public void showBackground() {
mBackground.showSecondLayer(); mBackground.showSecondLayer();
} }
/**
* Cancels the animator if it's running.
*/
public void cancelAnimator() {
if (mAnimator != null) {
mAnimator.cancel();
}
}
} }

5
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -208,6 +208,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
public void showImmediately() { public void showImmediately() {
if (!isShown) { if (!isShown) {
setVisibility(VISIBLE); setVisibility(VISIBLE);
mClipper.cancelAnimator();
mClipper.showBackground(); mClipper.showBackground();
isShown = true; isShown = true;
setTileSpecs(); setTileSpecs();
@@ -230,6 +231,10 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
mUiEventLogger.log(QSEditEvent.QS_EDIT_CLOSED); mUiEventLogger.log(QSEditEvent.QS_EDIT_CLOSED);
isShown = false; isShown = false;
mToolbar.dismissPopupMenus(); mToolbar.dismissPopupMenus();
mClipper.cancelAnimator();
// Make sure we're not opening (because we're closing). Nobody can think we are
// customizing after the next two lines.
mOpening = false;
setCustomizing(false); setCustomizing(false);
save(); save();
if (animate) { if (animate) {