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

Commit bbf8acb5 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
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
parents 3d984a77 731d0c41
Loading
Loading
Loading
Loading
+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();
    }
+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);
    }