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

Merge "Fix back button not disappearing" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-20 03:01:02 +00:00
committed by Android (Google) Code Review
parent 6490c31b4c 96c5fc4852
commit e1bdc4b0e8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java
View File

@@ -61,6 +61,7 @@ public class ButtonDispatcher {
private final AnimatorListenerAdapter mFadeListener = new AnimatorListenerAdapter() { private final AnimatorListenerAdapter mFadeListener = new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
mFadeAnimator = null;
setVisibility(getAlpha() == 1 ? View.VISIBLE : View.INVISIBLE); setVisibility(getAlpha() == 1 ? View.VISIBLE : View.INVISIBLE);
} }
}; };
@@ -143,7 +144,6 @@ public class ButtonDispatcher {
if (mVisibility == visibility) return; if (mVisibility == visibility) return;
if (mFadeAnimator != null) { if (mFadeAnimator != null) {
mFadeAnimator.cancel(); mFadeAnimator.cancel();
mFadeAnimator = null;
} }
mVisibility = visibility; mVisibility = visibility;
@@ -176,13 +176,13 @@ public class ButtonDispatcher {
if (mFadeAnimator != null) { if (mFadeAnimator != null) {
mFadeAnimator.cancel(); mFadeAnimator.cancel();
} }
setVisibility(View.VISIBLE);
mFadeAnimator = ValueAnimator.ofFloat(getAlpha(), alpha); mFadeAnimator = ValueAnimator.ofFloat(getAlpha(), alpha);
mFadeAnimator.setDuration(duration); mFadeAnimator.setDuration(duration);
mFadeAnimator.setInterpolator(getAlpha() < alpha ? ALPHA_IN : ALPHA_OUT); mFadeAnimator.setInterpolator(getAlpha() < alpha ? ALPHA_IN : ALPHA_OUT);
mFadeAnimator.addListener(mFadeListener); mFadeAnimator.addListener(mFadeListener);
mFadeAnimator.addUpdateListener(mAlphaListener); mFadeAnimator.addUpdateListener(mAlphaListener);
mFadeAnimator.start(); mFadeAnimator.start();
setVisibility(View.VISIBLE);
} else { } else {
mAlpha = alpha; mAlpha = alpha;
final int N = mViews.size(); final int N = mViews.size();