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

Commit b867f3b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Post updateClockViews when called within onLayout" into tm-dev am: 94c91a89 

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



Change-Id: I24d8e6d7ee853bd2b33707ce18dfe9dc89c02fae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d0d6297 94c91a89

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

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.IntentFilter; 
import android.content.res.Resources;

import android.graphics.Color;

import android.icu.text.NumberFormat;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;
@@ -144,7 +143,6 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie 


    @Override

    protected void onViewAttached() {

        Log.d(TAG, "onViewAttached mView=" + mView);

        updateLocale();

        mBroadcastDispatcher.registerReceiver(mLocaleBroadcastReceiver,

                new IntentFilter(Intent.ACTION_LOCALE_CHANGED));
@@ -162,7 +160,6 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie 


    @Override

    protected void onViewDetached() {

        Log.d(TAG, "onViewDetached mView=" + mView);

        mBroadcastDispatcher.unregisterReceiver(mLocaleBroadcastReceiver);

        mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback);

        mBatteryController.removeCallback(mBatteryCallback);

packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt

+0 −27
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.Canvas 
import android.text.TextUtils

import android.text.format.DateFormat

import android.util.AttributeSet

import android.util.Log

import android.widget.TextView

import com.android.systemui.R

import com.android.systemui.animation.Interpolators
@@ -133,22 +132,6 @@ class AnimatableClockView @JvmOverloads constructor( 
        // relayout if the text didn't actually change.

        if (!TextUtils.equals(text, formattedText)) {

            text = formattedText

            Log.d(

                tag, "refreshTime this=$this" +

                        " currTimeContextDesc=$contentDescription" +

                        " measuredHeight=$measuredHeight" +

                        " lastMeasureCall=$lastMeasureCall" +

                        " isSingleLineInternal=$isSingleLineInternal"

            )

        } else {

            Log.d(

                tag, "refreshTime (skipped due to unchanged text)" +

                        " this=$this" +

                        " currTimeContextDesc=$contentDescription" +

                        " measuredHeight=$measuredHeight" +

                        " lastMeasureCall=$lastMeasureCall" +

                        " isSingleLineInternal=$isSingleLineInternal"

            )

        }

    }
@@ -169,20 +152,10 @@ class AnimatableClockView @JvmOverloads constructor( 
        } else {

            animator.updateLayout(layout)

        }

        Log.v(tag, "onMeasure this=$this" +

                " currTimeContextDesc=$contentDescription" +

                " heightMeasureSpecMode=${MeasureSpec.getMode(heightMeasureSpec)}" +

                " heightMeasureSpecSize=${MeasureSpec.getSize(heightMeasureSpec)}" +

                " measuredWidth=$measuredWidth" +

                " measuredHeight=$measuredHeight" +

                " isSingleLineInternal=$isSingleLineInternal")

    }



    override fun onDraw(canvas: Canvas) {

        // intentionally doesn't call super.onDraw here or else the text will be rendered twice

        Log.d(tag, "onDraw this=$this" +

                " currTimeContextDesc=$contentDescription" +

                " isSingleLineInternal=$isSingleLineInternal")

        textAnimator?.draw(canvas)

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        super.onLayout(changed, l, t, r, b);



        if (mDisplayedClockSize != null && !mChildrenAreLaidOut) {

            updateClockViews(mDisplayedClockSize == LARGE, /* animate */ true);

            post(() -> updateClockViews(mDisplayedClockSize == LARGE, /* animate */ true));

        }



        mChildrenAreLaidOut = true;