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

Commit 1c90e728 authored by Matt Pietal's avatar Matt Pietal
Browse files

Smartspace in wrong position 

KeyguardClockSwitch will be recreated by
NotificationPanelViewController for a variety of reasons, including
onDensityOrFontScaleChanged(). When this happens, the large/small
clock state can get out of sync with the initial state. Set the clock
state to null on creation to avoid this.

Fixes: 188390632
Test: manual, it's a race condition that can be hard to trigger
Change-Id: I49cda9afd5c708b05aba56a40d29c1cefe847de4
parent 00d26d71

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;