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

Commit 2b2c1fb4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enable keyguard remote animation." into sc-v2-dev am: c8235441 am: 961177ec 

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

Change-Id: I9034c789ffe69598048b33eccd12aede2858fdea
parents d2eceabf 961177ec

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

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,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

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

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,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