Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev (13e74f97) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -840,8 +840,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,

		@Override
		public void onLaunchAnimationCancelled() {
		Log.d(TAG, "Occlude launch animation cancelled. "
		+ "Occluded state is now: " + mOccluded);
		setOccluded(true /* occluded /, false / animate */);
		Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "
		+ mOccluded);
		}

		@NonNull
		@@ -904,6 +905,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
		if (mUnoccludeAnimator != null) {
		mUnoccludeAnimator.cancel();
		}

		setOccluded(false /* isOccluded /, false / animate */);
		Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "
		+ mOccluded);
		}

		@Override