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

Commit da70b9fa authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Fixing smartspace position on lockscreen with big clock visible on... 

Merge "Fixing smartspace position on lockscreen with big clock visible on large screens" into sc-v2-dev am: bbf8acb5

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

Change-Id: Ie162f6df67eb3b2422c9246918cfea4288d1c193
parents 020ae864 bbf8acb5

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

+24 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import android.util.AttributeSet; 
import android.util.TypedValue;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewTreeObserver.OnPreDrawListener;

import android.widget.FrameLayout;

import android.widget.RelativeLayout;
@@ -93,6 +94,7 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    private int[] mColorPalette;



    private int mClockSwitchYAmount;

    @VisibleForTesting boolean mChildrenAreLaidOut = false;



    public KeyguardClockSwitch(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -284,11 +286,31 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        if (mDisplayedClockSize != null && clockSize == mDisplayedClockSize) {

            return false;

        }



        // let's make sure clock is changed only after all views were laid out so we can

        // translate them properly

        if (mChildrenAreLaidOut) {

            animateClockChange(clockSize == LARGE);

            mDisplayedClockSize = clockSize;

        } else {

            getViewTreeObserver().addOnPreDrawListener(new OnPreDrawListener() {

                @Override

                public boolean onPreDraw() {

                    switchToClock(clockSize);

                    getViewTreeObserver().removeOnPreDrawListener(this);

                    return true;

                }

            });

        }

        return true;

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {

        super.onLayout(changed, l, t, r, b);

        mChildrenAreLaidOut = true;

    }



    public Paint getPaint() {

        return mClockView.getPaint();

    }

packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchTest.java

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class KeyguardClockSwitchTest extends SysuiTestCase { 
        mLargeClockFrame = mKeyguardClockSwitch.findViewById(R.id.lockscreen_clock_view_large);

        mLargeClockView = mKeyguardClockSwitch.findViewById(R.id.animatable_clock_view_large);

        mBigClock = new TextClock(getContext());

        mKeyguardClockSwitch.mChildrenAreLaidOut = true;

        MockitoAnnotations.initMocks(this);

    }