Merge "Unocclude immediately so that the surface animation is visible." into tm-dev (aa9e92c1) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -911,12 +911,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
	RemoteAnimationTarget[] wallpapers,		RemoteAnimationTarget[] wallpapers,
	RemoteAnimationTarget[] nonApps,		RemoteAnimationTarget[] nonApps,
	IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {		IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {
			setOccluded(false /* isOccluded /, true / animate */);

	if (apps == null \|\| apps.length == 0 \|\| apps[0] == null) {		if (apps == null \|\| apps.length == 0 \|\| apps[0] == null) {
	Log.d(TAG, "No apps provided to unocclude runner; "		Log.d(TAG, "No apps provided to unocclude runner; "
	+ "skipping animation and unoccluding.");		+ "skipping animation and unoccluding.");

	finishedCallback.onAnimationFinished();		finishedCallback.onAnimationFinished();
	setOccluded(false /* isOccluded /, true / animate */);
	return;		return;
	}		}

	@@ -961,7 +961,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
	@Override		@Override
	public void onAnimationEnd(Animator animation) {		public void onAnimationEnd(Animator animation) {
	try {		try {
	setOccluded(false /* isOccluded /, true / animate */);
	finishedCallback.onAnimationFinished();		finishedCallback.onAnimationFinished();
	mUnoccludeAnimator = null;		mUnoccludeAnimator = null;
	} catch (RemoteException e) {		} catch (RemoteException e) {