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

Fixed an issue where the scrim could be lost

Browse Source 
When the lockscreen camera was launched, the launch
transition flags were not correctly updated, leading
to the scrim not updating anymore.

Change-Id: Ief5f9eae4d9aacd5177d72e6902451c92552d0d1
Fixes: 28404975
This commit is contained in:
Selim Cinek
2016-05-04 11:11:10 -07:00
parent e85788710a
commit ca59dc0df5
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) {
mOnAnimationFinished.run();
mOnAnimationFinished = null;
mKeyguardFadingOutInProgress = false;
}
mKeyguardFadingOutInProgress = false;
scrim.setTag(TAG_KEY_ANIM, null);
scrim.setTag(TAG_KEY_ANIM_TARGET, null);
}
@@ -384,10 +384,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
private void endAnimateKeyguardFadingOut(boolean force) {
mAnimateKeyguardFadingOut = false;
if ((force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind)))
&& mOnAnimationFinished != null) {
mOnAnimationFinished.run();
mOnAnimationFinished = null;
if (force || (!isAnimating(mScrimInFront) && !isAnimating(mScrimBehind))) {
if (mOnAnimationFinished != null) {
mOnAnimationFinished.run();
mOnAnimationFinished = null;
}
mKeyguardFadingOutInProgress = false;
}
}