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

Merge changes from topic "RemoteAnimationCanceled_with_Occluded-tm-dev" into tm-dev am: 97641ffe50 am: 4623f654c1

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

Change-Id: I4a3d1a1a75ca6015777b9f3666c10b48d60f2331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Issei Suzuki
2022-06-29 19:22:54 +00:00
committed by Automerger Merge Worker
parent 1e658dd406 4623f654c1
commit c6f2cc5549
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -842,7 +842,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
@Override @Override
public void onLaunchAnimationCancelled() { public void onLaunchAnimationCancelled() {
setOccluded(true /* occluded */, false /* animate */);
Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: " Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "
+ mOccluded); + mOccluded);
} }
@@ -915,7 +914,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
mUnoccludeAnimator.cancel(); mUnoccludeAnimator.cancel();
} }
setOccluded(isKeyguardOccluded, false /* animate */); setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);
Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: " Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "
+ mOccluded); + mOccluded);
} }
@@ -3205,7 +3204,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
@Override @Override
public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException { public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {
super.onAnimationCancelled(isKeyguardOccluded); super.onAnimationCancelled(isKeyguardOccluded);
Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: " + mOccluded); setOccluded(isKeyguardOccluded /* occluded */, false /* animate */);
Log.d(TAG, "Occlude animation cancelled by WM. "
+ "Setting occluded state to: " + mOccluded);
} }
} }
} }