Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebbaf4f1 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable remote animation for keygaurd."" into sc-dev am: c5505e4a 

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

Change-Id: I10c6315d124d7c2799d941513ec38e5a2bdc274a
parents bb77fd3a c5505e4a

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class KeyguardService extends Service { 
     * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY

     */

    private static boolean sEnableRemoteKeyguardAnimation =

            SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, true);

            SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, false);



    private final KeyguardViewMediator mKeyguardViewMediator;

    private final KeyguardLifecyclesDispatcher mKeyguardLifecyclesDispatcher;

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ public class WindowManagerService extends IWindowManager.Stub 
     * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY

     */

    public static boolean sEnableRemoteKeyguardAnimation =

            SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, true);

            SystemProperties.getBoolean(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, false);



    private static final String DISABLE_TRIPLE_BUFFERING_PROPERTY =

            "ro.sf.disable_triple_buffer";