Merge "Unocclude immediately so that the surface animation is visible." into tm-dev am: aa9e92c1a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169504

Change-Id: Ibb102ae5fad0db13ba3b2d3537b05d668545a066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josh Tsuji
2022-05-05 15:00:19 +00:00
committed by Automerger Merge Worker

View File

@@ -911,12 +911,12 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
RemoteAnimationTarget[] wallpapers,
RemoteAnimationTarget[] nonApps,
IRemoteAnimationFinishedCallback finishedCallback) throws RemoteException {
setOccluded(false /* isOccluded */, true /* animate */);
if (apps == null || apps.length == 0 || apps[0] == null) {
Log.d(TAG, "No apps provided to unocclude runner; "
+ "skipping animation and unoccluding.");
finishedCallback.onAnimationFinished();
setOccluded(false /* isOccluded */, true /* animate */);
return;
}
@@ -961,7 +961,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
@Override
public void onAnimationEnd(Animator animation) {
try {
setOccluded(false /* isOccluded */, true /* animate */);
finishedCallback.onAnimationFinished();
mUnoccludeAnimator = null;
} catch (RemoteException e) {