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

Commit 278f46b0 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I9dbd5997c527c9c5e117a54096e450988f32f7ed
parents 0b1fe359 08ba30a5

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+5 −3
Original line number Diff line number Diff line
@@ -64,9 +64,10 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    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 mClockOutAnim = null;
@@ -263,7 +264,8 @@ public class KeyguardClockSwitch extends RelativeLayout { 
     * the smaller version.

     */

    boolean willSwitchToLargeClock(boolean hasVisibleNotifications) {

        if (hasVisibleNotifications == mHasVisibleNotifications) {

        if (mHasVisibleNotifications != null

                && hasVisibleNotifications == mHasVisibleNotifications) {

            return false;

        }

        boolean useLargeClock = !hasVisibleNotifications;