From b7d9f4fff003f75841e38747f1717fddb8757c86 Mon Sep 17 00:00:00 2001 From: Tyler Dewey Date: Tue, 24 Oct 2023 20:10:24 +0000 Subject: Add some debug logging for SC text fade animations. Bug: 283953501 Test: treehugger Relnote: N/a Change-Id: Ic88c0d3be54861002e7ca381fbdf9fa72d95ff08 --- .../safetycenter/ui/SafetyStatusPreference.java | 8 +++++--- .../safetycenter/ui/TextFadeAnimator.kt | 13 ++++++++----- .../safetycenter/ui/view/MoreIssuesHeaderView.kt | 1 + 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java index 3242ea84b..c022daa47 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java @@ -75,7 +75,7 @@ public class SafetyStatusPreference extends Preference implements ComparablePref @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); - Log.d(TAG, String.format("onBindViewHolder called for status %s", mStatus)); + Log.v(TAG, String.format("onBindViewHolder called for status %s", mStatus)); if (mStatus == null) { return; @@ -144,12 +144,14 @@ public class SafetyStatusPreference extends Preference implements ComparablePref if (mIsTextChangeAnimationRunning) { return; } + Log.v(TAG, "Starting status text animation"); String titleText = mStatus.getTitle().toString(); String summaryText = mStatus.getSummary(getContext()).toString(); boolean titleEquals = titleView.getText().toString().equals(titleText); boolean summaryEquals = summaryView.getText().toString().equals(summaryText); Runnable onFinish = () -> { + Log.v(TAG, "Finishing status text animation"); mIsTextChangeAnimationRunning = false; runTextAnimationIfNeeded(titleView, summaryView); }; @@ -339,7 +341,7 @@ public class SafetyStatusPreference extends Preference implements ComparablePref void setData(StatusUiData statusUiData) { mStatus = statusUiData; - Log.d(TAG, String.format("setData called for status %s", mStatus)); + Log.v(TAG, String.format("setData called for status %s", mStatus)); safeNotifyChanged(); } @@ -357,7 +359,7 @@ public class SafetyStatusPreference extends Preference implements ComparablePref new Handler(Looper.getMainLooper()) .post( () -> { - Log.d( + Log.v( TAG, String.format("Calling notifyChanged for status %s", mStatus)); notifyChanged(); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/TextFadeAnimator.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/TextFadeAnimator.kt index 656c3800a..48acad438 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/TextFadeAnimator.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/TextFadeAnimator.kt @@ -21,6 +21,7 @@ import android.transition.Transition import android.transition.TransitionListenerAdapter import android.transition.TransitionManager import android.transition.TransitionSet +import android.util.Log import android.view.View import android.view.ViewGroup import android.view.animation.LinearInterpolator @@ -64,6 +65,9 @@ constructor(targetIds: List, changeDuration: Duration = DEFAULT_TEXT_CHANGE if (textChanges.isEmpty()) { return } + + Log.v(TAG, "Starting text animation") + val firstView = textChanges[0].first val parentViewGroup: ViewGroup = firstView.parent as ViewGroup val fadeOutTransition = @@ -71,17 +75,14 @@ constructor(targetIds: List, changeDuration: Duration = DEFAULT_TEXT_CHANGE .clone() .addListener( object : TransitionListenerAdapter() { - override fun onTransitionStart(transition: Transition?) { - super.onTransitionStart(transition) - } override fun onTransitionEnd(transition: Transition?) { - super.onTransitionEnd(transition) fadeTextIn(textChanges, parentViewGroup, onFinish) } } ) parentViewGroup.post { TransitionManager.beginDelayedTransition(parentViewGroup, fadeOutTransition) + Log.v(TAG, "Starting text fade-out transition") for ((textView, _) in textChanges) { textView.visibility = View.INVISIBLE } @@ -99,7 +100,7 @@ constructor(targetIds: List, changeDuration: Duration = DEFAULT_TEXT_CHANGE .addListener( object : TransitionListenerAdapter() { override fun onTransitionEnd(transition: Transition?) { - super.onTransitionEnd(transition) + Log.v(TAG, String.format("Finishing text animation")) onFinish?.run() } } @@ -107,6 +108,7 @@ constructor(targetIds: List, changeDuration: Duration = DEFAULT_TEXT_CHANGE parent.post { TransitionManager.beginDelayedTransition(parent, fadeInTransition) + Log.v(TAG, "Starting text fade-in transition") for ((textView, text) in textChanges) { textView.text = text textView.visibility = View.VISIBLE @@ -119,6 +121,7 @@ constructor(targetIds: List, changeDuration: Duration = DEFAULT_TEXT_CHANGE } companion object { + private const val TAG = "TextFadeAnimator" // Duration is for fade-out & fade-in individually, not combined private val DEFAULT_TEXT_CHANGE_DURATION = Duration.ofMillis(167) private val linearInterpolator = LinearInterpolator() diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt index 00cfd141a..b8142e1ca 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt @@ -168,6 +168,7 @@ constructor( if (animateTextChange) { counterView.text = previousText + Log.v(TAG, "Starting more issues card text animation") moreIssuesCardAnimator.animateChangeText(counterView, newText) } else { counterView.text = newText -- cgit v1.2.3