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

Merge "Fix flashing of the scrim" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-03-09 00:26:29 +00:00
committed by Android (Google) Code Review
parent c75af36bee 5f72c92e2b
commit c192f6bf35
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -89,6 +89,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
private boolean mForceHideScrims;
private boolean mSkipFirstFrame;
private boolean mDontAnimateBouncerChanges;
private boolean mKeyguardFadingOutInProgress;
public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) {
mScrimBehind = scrimBehind;
@@ -342,12 +343,16 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
if (mOnAnimationFinished != null) {
mOnAnimationFinished.run();
mOnAnimationFinished = null;
mKeyguardFadingOutInProgress = false;
}
scrim.setTag(TAG_KEY_ANIM, null);
scrim.setTag(TAG_KEY_ANIM_TARGET, null);
}
});
anim.start();
if (mAnimateKeyguardFadingOut) {
mKeyguardFadingOutInProgress = true;
}
if (mSkipFirstFrame) {
anim.setCurrentPlayTime(16);
}
@@ -382,6 +387,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
&& mOnAnimationFinished != null) {
mOnAnimationFinished.run();
mOnAnimationFinished = null;
mKeyguardFadingOutInProgress = false;
}
}
@@ -422,6 +428,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
}
private void updateScrim(boolean animate, View scrim, float alpha, float currentAlpha) {
if (mKeyguardFadingOutInProgress) {
return;
}
ValueAnimator previousAnimator = StackStateAnimator.getChildTag(scrim,
TAG_KEY_ANIM);
float animEndValue = -1;