diff options
3 files changed, 1 insertions, 31 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java index 3c4c1b6dc2d1..487e1a48044c 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java @@ -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); diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt index 19d39d515325..e22386e78359 100644 --- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt +++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockView.kt @@ -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) } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java index bd5bceb4b3f9..40edfe50d907 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java @@ -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; |