From 6ceb0988ed85e238ab58b3419b868eb491a37ea0 Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Mon, 7 Jun 2021 11:01:54 +0200 Subject: [PATCH 1/4] Extend property to enable remote animation for keyguard. There are two types of keyguard invovlved app transitions. Instead of enabling / disabling remote animation for all such transitions, we can now enable remote animation one by one. Disable remote animation for all keyguard transitions. % adb shell setprop persist.wm.enable_remote_keyguard_animation 0 Enable remote animation only for keyguard going away transition (default). % adb shell setprop persist.wm.enable_remote_keyguard_animation 1 Enable remote animation for both keyguard going away and (un)occlude transition. % adb shell setprop persist.wm.enable_remote_keyguard_animation 2 After setting the property, you need to restart shell and sysui, or reboot the device. Test: No-op chaneg. Pass existing tests. Bug: 166736690 Change-Id: I81cf31fe60583f0fe0d9f46c3189fc0309e8374f --- .../systemui/keyguard/KeyguardService.java | 28 +++++++++++++++---- .../KeyguardUnlockAnimationController.kt | 2 +- .../keyguard/KeyguardViewMediator.java | 4 +-- .../systemui/statusbar/phone/StatusBar.java | 2 +- .../server/policy/PhoneWindowManager.java | 2 +- .../keyguard/KeyguardServiceDelegate.java | 6 ++-- .../server/wm/WindowManagerService.java | 27 ++++++++++++++++-- 7 files changed, 56 insertions(+), 15 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 5a5cce8f5093f..62b92cb33f5c3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -51,6 +51,7 @@ import com.android.internal.policy.IKeyguardExitCallback; import com.android.internal.policy.IKeyguardService; import com.android.internal.policy.IKeyguardStateCallback; import com.android.systemui.SystemUIApplication; +import com.android.wm.shell.transition.Transitions; import javax.inject.Inject; @@ -62,16 +63,29 @@ public class KeyguardService extends Service { * Run Keyguard animation as remote animation in System UI instead of local animation in * the server process. * + * 0: Runs all keyguard animation as local animation + * 1: Only runs keyguard going away animation as remote animation + * 2: Runs all keyguard animation as remote animation + * * Note: Must be consistent with WindowManagerService. */ private static final String ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY = "persist.wm.enable_remote_keyguard_animation"; + private static final int sEnableRemoteKeyguardAnimation = + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); + /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY */ - public static boolean sEnableRemoteKeyguardAnimation = - SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, false); + public static boolean sEnableRemoteKeyguardGoingAwayAnimation = + !Transitions.ENABLE_SHELL_TRANSITIONS && sEnableRemoteKeyguardAnimation >= 1; + + /** + * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY + */ + public static boolean sEnableRemoteKeyguardOccludeAnimation = + !Transitions.ENABLE_SHELL_TRANSITIONS && sEnableRemoteKeyguardAnimation >= 2; private final KeyguardViewMediator mKeyguardViewMediator; private final KeyguardLifecyclesDispatcher mKeyguardLifecyclesDispatcher; @@ -83,20 +97,22 @@ public class KeyguardService extends Service { mKeyguardViewMediator = keyguardViewMediator; mKeyguardLifecyclesDispatcher = keyguardLifecyclesDispatcher; - if (sEnableRemoteKeyguardAnimation) { - RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); + RemoteAnimationDefinition definition = new RemoteAnimationDefinition(); + if (sEnableRemoteKeyguardGoingAwayAnimation) { final RemoteAnimationAdapter exitAnimationAdapter = new RemoteAnimationAdapter(mExitAnimationRunner, 0, 0); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_GOING_AWAY, exitAnimationAdapter); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER, exitAnimationAdapter); + } + if (sEnableRemoteKeyguardOccludeAnimation) { final RemoteAnimationAdapter occludeAnimationAdapter = new RemoteAnimationAdapter(mOccludeAnimationRunner, 0, 0); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_OCCLUDE, occludeAnimationAdapter); definition.addRemoteAnimation(TRANSIT_OLD_KEYGUARD_UNOCCLUDE, occludeAnimationAdapter); - ActivityTaskManager.getInstance().registerRemoteAnimationsForDisplay( - DEFAULT_DISPLAY, definition); } + ActivityTaskManager.getInstance().registerRemoteAnimationsForDisplay( + DEFAULT_DISPLAY, definition); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index 665376ac45694..0ecd70eadee99 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -317,7 +317,7 @@ class KeyguardUnlockAnimationController @Inject constructor( } override fun onKeyguardDismissAmountChanged() { - if (!KeyguardService.sEnableRemoteKeyguardAnimation) { + if (!KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation) { return } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 56efafba4640f..257c82ae6af51 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -2180,7 +2180,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, IRemoteAnimationRunner runner = mKeyguardExitAnimationRunner; mKeyguardExitAnimationRunner = null; - if (KeyguardService.sEnableRemoteKeyguardAnimation && runner != null + if (KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation && runner != null && finishedCallback != null) { // Wrap finishedCallback to clean up the keyguard state once the animation is done. IRemoteAnimationFinishedCallback callback = @@ -2211,7 +2211,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, // When remaining on the shade, there's no need to do a fancy remote animation, // it will dismiss the panel in that case. - } else if (KeyguardService.sEnableRemoteKeyguardAnimation + } else if (KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation && !mStatusBarStateController.leaveOpenOnKeyguardHide() && apps != null && apps.length > 0) { mSurfaceBehindRemoteAnimationFinishedCallback = finishedCallback; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 09779d12f7b34..c34eadfb5a3c8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -2101,7 +2101,7 @@ public class StatusBar extends SystemUI implements DemoMode, // launches as they can break the animation. // TODO(b/184121838): Support non activity launches on the lockscreen. return isActivityIntent - && KeyguardService.sEnableRemoteKeyguardAnimation + && KeyguardService.sEnableRemoteKeyguardGoingAwayAnimation && mKeyguardStateController.canDismissLockScreen(); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index f3b8c7e3e209f..22ddc8111f6e9 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3044,7 +3044,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private int handleStartTransitionForKeyguardLw(boolean keyguardGoingAway, long duration) { final int res = applyKeyguardOcclusionChange(); if (res != 0) return res; - if (!WindowManagerService.sEnableRemoteKeyguardAnimation && keyguardGoingAway) { + if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation && keyguardGoingAway) { if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation"); startKeyguardExitAnimation(SystemClock.uptimeMillis(), duration); } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index cdce660835b62..0535af57d8abb 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -264,7 +264,8 @@ public class KeyguardServiceDelegate { */ @Deprecated public void setOccluded(boolean isOccluded, boolean animate) { - if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) { + if (!WindowManagerService.sEnableRemoteKeyguardOccludeAnimation + && mKeyguardService != null) { if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ") animate=" + animate); mKeyguardService.setOccluded(isOccluded, animate); } @@ -405,7 +406,8 @@ public class KeyguardServiceDelegate { } public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) { - if (!WindowManagerService.sEnableRemoteKeyguardAnimation && mKeyguardService != null) { + if (!WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation + && mKeyguardService != null) { mKeyguardService.startKeyguardExitAnimation(startTime, fadeoutDuration); } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 1042a0b13e1c1..5f3f2bd729d98 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -421,19 +421,42 @@ public class WindowManagerService extends IWindowManager.Stub static boolean sDisableCustomTaskAnimationProperty = SystemProperties.getBoolean(DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY, true); + /** + * Use WMShell for app transition. + */ + public static final String ENABLE_SHELL_TRANSITIONS = "persist.debug.shell_transit"; + + /** + * @see #ENABLE_SHELL_TRANSITIONS + */ + public static final boolean sEnableShellTransitions = + SystemProperties.getBoolean(ENABLE_SHELL_TRANSITIONS, false); + /** * Run Keyguard animation as remote animation in System UI instead of local animation in * the server process. + * + * 0: Runs all keyguard animation as local animation + * 1: Only runs keyguard going away animation as remote animation + * 2: Runs all keyguard animation as remote animation */ private static final String ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY = "persist.wm.enable_remote_keyguard_animation"; + private static final int sEnableRemoteKeyguardAnimation = + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); + /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY */ - public static boolean sEnableRemoteKeyguardAnimation = - SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, false); + public static final boolean sEnableRemoteKeyguardGoingAwayAnimation = !sEnableShellTransitions + && sEnableRemoteKeyguardAnimation >= 1; + /** + * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY + */ + public static final boolean sEnableRemoteKeyguardOccludeAnimation = !sEnableShellTransitions + && sEnableRemoteKeyguardAnimation >= 2; /** * Allows a fullscreen windowing mode activity to launch in its desired orientation directly From 52e22aab2bc5c77908f42eb18c7d5a8737d3e500 Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Wed, 9 Jun 2021 10:06:58 +0200 Subject: [PATCH 2/4] Stop animating wallpaper and non-app windows in WM When keyguard is going away, WM applies animation on the wallpaper and non-app windows. With remote animation enabled, all animation will be handled in KeyguardService, so WM shouldn't apply animation locally. Bug: 175686682 Test: Manual. Tap notification on the lock screen to dismiss keyguard, verify alpha value of the wallpaper surface unchanged. Change-Id: I46879ef872cfa38e99586cbeb4c991d1ec359e87 --- .../com/android/server/wm/AppTransitionController.java | 8 +++++--- services/core/java/com/android/server/wm/Transition.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index e7c51a4ac65ad..eaebb6f1ce748 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -800,7 +800,8 @@ public class AppTransitionController { } private void handleNonAppWindowsInTransition(@TransitionOldType int transit, int flags) { - if (transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY) { + if (transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY + && !WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation) { if ((flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0 && (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION) == 0 && (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION) == 0) { @@ -812,8 +813,9 @@ public class AppTransitionController { } } } - if (transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY - || transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER) { + if ((transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY + || transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER) + && !WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation) { mDisplayContent.startKeyguardExitOnNonAppWindows( transit == TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER, (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE) != 0, diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 42e2d2fc79d38..0cd0980704014 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -401,7 +401,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe if (dc == null) { return; } - if (transit == TRANSIT_KEYGUARD_GOING_AWAY) { + if (transit == TRANSIT_KEYGUARD_GOING_AWAY + && !WindowManagerService.sEnableRemoteKeyguardGoingAwayAnimation) { if ((flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER) != 0 && (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION) == 0 && (flags & TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION) == 0) { From b061c2bec95c6cb3968802307ff52ae0dfdea6b4 Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Thu, 10 Jun 2021 12:16:14 +0200 Subject: [PATCH 3/4] Continue to dismiss keyguard when the remote animation is cancelled. The keyguard going away process is consists of several steps between the system and KeyguardService. 1. KeyguardService notifies the system that the Keyguard is going away. 2. The system prepares for the app transition, and notifies the KeyguardService that the app transition is ready. 3. The KeyguardService run a remote animation. 4. When the animation finishes, the KeyguardService notifies back to the system. During the step 3, it's possible that the server cancels the animation due to, for example, another app transition needs to be started. In this case, we don't go back to the keyguard but finishes dismiss process. Bug: 166736690 Bug: 188824028 Test: pass launcher3 MemoryTests, TaplTestsLauncher3 on test servers. Change-Id: I3e45ca52b0006f89837365fb3f51a4372cc68060 --- .../KeyguardUnlockAnimationController.kt | 8 ++++-- .../keyguard/KeyguardViewMediator.java | 28 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt index 0ecd70eadee99..38d153e38ca96 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt @@ -162,7 +162,8 @@ class KeyguardUnlockAnimationController @Inject constructor( // If the surface alpha is 0f, it's no longer visible so we can safely be done with // the animation. if (surfaceBehindAlpha == 0f) { - keyguardViewMediator.get().finishSurfaceBehindRemoteAnimation() + keyguardViewMediator.get().finishSurfaceBehindRemoteAnimation( + false /* cancelled */) } } }) @@ -175,7 +176,8 @@ class KeyguardUnlockAnimationController @Inject constructor( } surfaceBehindEntryAnimator.addListener(object : AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { - keyguardViewMediator.get().onKeyguardExitRemoteAnimationFinished() + keyguardViewMediator.get().onKeyguardExitRemoteAnimationFinished( + false /* cancelled */) } }) @@ -370,7 +372,7 @@ class KeyguardUnlockAnimationController @Inject constructor( } else if (keyguardViewMediator.get() .isAnimatingBetweenKeyguardAndSurfaceBehindOrWillBe && reachedHideKeyguardThreshold) { - keyguardViewMediator.get().onKeyguardExitRemoteAnimationFinished() + keyguardViewMediator.get().onKeyguardExitRemoteAnimationFinished(false /* cancelled */) } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 257c82ae6af51..f0d7d833a9fbe 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -2315,15 +2315,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } /** - * Called if the keyguard exit animation has been cancelled and we should return to the + * Called if the keyguard exit animation has been cancelled and we should dismiss to the * keyguard. * - * This can happen due to the system cancelling the RemoteAnimation (due to a timeout), or the - * user cancelling the unlock swipe gesture. + * This can happen due to the system cancelling the RemoteAnimation (due to a timeout, a new + * app transition before finishing the current RemoteAnimation). */ private void handleCancelKeyguardExitAnimation() { - hideSurfaceBehindKeyguard(); - mKeyguardUnlockAnimationControllerLazy.get().notifyCancelKeyguardExitAnimation(); + showSurfaceBehindKeyguard(); + onKeyguardExitRemoteAnimationFinished(true /* cancelled */); } /** @@ -2332,8 +2332,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, * This will call {@link #mSurfaceBehindRemoteAnimationFinishedCallback} to let WM know that * we're done with the RemoteAnimation, actually hide the keyguard, and clean up state related * to the keyguard exit animation. + * + * @param cancelled {@code true} if the animation was cancelled before it finishes. */ - public void onKeyguardExitRemoteAnimationFinished() { + public void onKeyguardExitRemoteAnimationFinished(boolean cancelled) { if (!mSurfaceBehindRemoteAnimationRunning && !mSurfaceBehindRemoteAnimationRequested) { return; } @@ -2347,7 +2349,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, mKeyguardUnlockAnimationControllerLazy.get().hideKeyguardViewAfterRemoteAnimation(); } - finishSurfaceBehindRemoteAnimation(); + finishSurfaceBehindRemoteAnimation(cancelled); mSurfaceBehindRemoteAnimationRequested = false; mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(); InteractionJankMonitor.getInstance().end(CUJ_LOCKSCREEN_UNLOCK_ANIMATION); @@ -2389,12 +2391,14 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } /** If it's running, finishes the RemoteAnimation on the surface behind the keyguard. */ - public void finishSurfaceBehindRemoteAnimation() { + public void finishSurfaceBehindRemoteAnimation(boolean cancelled) { mSurfaceBehindRemoteAnimationRunning = false; if (mSurfaceBehindRemoteAnimationFinishedCallback != null) { try { - mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished(); + if (!cancelled) { + mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished(); + } mSurfaceBehindRemoteAnimationFinishedCallback = null; } catch (RemoteException e) { e.printStackTrace(); @@ -2638,10 +2642,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, } /** - * Cancel the keyguard exit animation, usually because we were swiping to unlock and the swipe - * gesture was cancelled. + * Cancel the keyguard exit animation, usually because we were swiping to unlock but WM starts + * a new remote animation before finishing the keyguard exit animation. * - * This will re-show the keyguard and animate out the app/launcher surface behind the keyguard. + * This will dismiss the keyguard. */ public void cancelKeyguardExitAnimation() { Trace.beginSection("KeyguardViewMediator#cancelKeyguardExitAnimation"); From 4f43e3ba509b8b2ee82fd7a7fe8b61af644162bb Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Wed, 14 Apr 2021 15:31:35 +0200 Subject: [PATCH 4/4] Enable remote animation for keyguard going away transition. Bug: 166736690 Test: Pass existing tests. Change-Id: I4dae426cfaac7d498463078de571892f2b82e24a --- .../src/com/android/systemui/keyguard/KeyguardService.java | 2 +- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index 62b92cb33f5c3..70837385b858b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -73,7 +73,7 @@ public class KeyguardService extends Service { "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5f3f2bd729d98..c1e29ebc47036 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -444,7 +444,7 @@ public class WindowManagerService extends IWindowManager.Stub "persist.wm.enable_remote_keyguard_animation"; private static final int sEnableRemoteKeyguardAnimation = - SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0); + SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); /** * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY