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

Merge "Revert "Enable remote animation for keyguard going away transition."" into sc-dev am: d24386cd85 am: 144533ffa5

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

Change-Id: Iaf8b2214d48e98b1ff8bab029a4fb967fbe144b3
This commit is contained in:
Adam Bookatz
2021-07-02 21:28:16 +00:00
committed by Automerger Merge Worker
parent e8e4a4daea 144533ffa5
commit 083b9a0823
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
View File

@@ -73,7 +73,7 @@ public class KeyguardService extends Service {
"persist.wm.enable_remote_keyguard_animation"; "persist.wm.enable_remote_keyguard_animation";
private static final int sEnableRemoteKeyguardAnimation = private static final int sEnableRemoteKeyguardAnimation =
SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0);
/** /**
* @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -446,7 +446,7 @@ public class WindowManagerService extends IWindowManager.Stub
"persist.wm.enable_remote_keyguard_animation"; "persist.wm.enable_remote_keyguard_animation";
private static final int sEnableRemoteKeyguardAnimation = private static final int sEnableRemoteKeyguardAnimation =
SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 1); SystemProperties.getInt(ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY, 0);
/** /**
* @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY * @see #ENABLE_REMOTE_KEYGUARD_ANIMATION_PROPERTY