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

Merge "Fixed an issue where the scrim could be lost" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-04 23:30:52 +00:00
committed by Android (Google) Code Review
parent 4ad13b3340 ca59dc0df5
commit 05d61edeb2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,8 +344,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
if (mOnAnimationFinished != null) { if (mOnAnimationFinished != null) {
mOnAnimationFinished.run(); mOnAnimationFinished.run();
mOnAnimationFinished = null; mOnAnimationFinished = null;
mKeyguardFadingOutInProgress = false;
} }
mKeyguardFadingOutInProgress = false;
scrim.setTag(TAG_KEY_ANIM, null); scrim.setTag(TAG_KEY_ANIM, null);
scrim.setTag(TAG_KEY_ANIM_TARGET, null); scrim.setTag(TAG_KEY_ANIM_TARGET, null);
} }
@@ -384,10 +384,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
private void endAnimateKeyguardFadingOut(boolean force) { private void endAnimateKeyguardFadingOut(boolean force) {
mAnimateKeyguardFadingOut = false; mAnimateKeyguardFadingOut = false;
if ((force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind))) if (force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind))) {
&& mOnAnimationFinished != null) { if (mOnAnimationFinished != null) {
mOnAnimationFinished.run(); mOnAnimationFinished.run();
mOnAnimationFinished = null; mOnAnimationFinished = null;
}
mKeyguardFadingOutInProgress = false; mKeyguardFadingOutInProgress = false;
} }
} }