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

Merge "Smartspace in wrong position" into sc-dev am: 08ba30a50e

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

Change-Id: Idb44a6267d6bbc4beaf38337dbfab74a552c9505
This commit is contained in:
Matt Pietal
2021-06-08 22:15:56 +00:00
committed by Automerger Merge Worker
parent d1a81e97a9 08ba30a50e
commit 3f6b90a1dc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
View File

@@ -64,9 +64,10 @@ public class KeyguardClockSwitch extends RelativeLayout {
private float mDarkAmount; private float mDarkAmount;
/** /**
* Boolean value indicating if notifications are visible on lock screen. * Boolean value indicating if notifications are visible on lock screen. Use null to signify
* it is uninitialized.
*/ */
private boolean mHasVisibleNotifications = true; private Boolean mHasVisibleNotifications = null;
private AnimatorSet mClockInAnim = null; private AnimatorSet mClockInAnim = null;
private AnimatorSet mClockOutAnim = null; private AnimatorSet mClockOutAnim = null;
@@ -263,7 +264,8 @@ public class KeyguardClockSwitch extends RelativeLayout {
* the smaller version. * the smaller version.
*/ */
boolean willSwitchToLargeClock(boolean hasVisibleNotifications) { boolean willSwitchToLargeClock(boolean hasVisibleNotifications) {
if (hasVisibleNotifications == mHasVisibleNotifications) { if (mHasVisibleNotifications != null
&& hasVisibleNotifications == mHasVisibleNotifications) {
return false; return false;
} }
boolean useLargeClock = !hasVisibleNotifications; boolean useLargeClock = !hasVisibleNotifications;