| commit | 144dc6893e7c49dc6c7723b35b17ab6a7ef0ef08 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Mon Jun 03 12:54:23 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 03 12:54:23 2024 +0000 |
| tree | 7a7465463257e1a3f162e5b832e518acbe5d9bbb | |
| parent | 145c4b66555fd7f98d11754e65d9569dedccc4ef [diff] | |
| parent | 5eba563df1025ed5794efeee8408951942f6daba [diff] |
Merge "Don't play an animation for WAKE + KEYGUARD_OCCLUDE" into main
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java index c79eef7e..cd478e5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java
@@ -143,6 +143,10 @@ } public static boolean handles(TransitionInfo info) { + // There is no animation for screen-wake unless we are immediately unlocking. + if (info.getType() == WindowManager.TRANSIT_WAKE && !info.isKeyguardGoingAway()) { + return false; + } return (info.getFlags() & KEYGUARD_VISIBILITY_TRANSIT_FLAGS) != 0; }