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 
am: 05d61edeb2

* commit '05d61edeb271167b6a9a97aa9adf1fe7bfb9bfbf':
  Fixed an issue where the scrim could be lost

Change-Id: I1fdb9d9636c477f24c934cdee618eab95fd3c574
This commit is contained in:
Selim Cinek
2016-05-04 23:34:22 +00:00
committed by android-build-merger
parent cf851a98de 05d61edeb2
commit 8ff4c0408d
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;
}
}