Commit 7f5aea44 authored Mar 22, 2024 by Julia Tuttle

CallStyle: don't reglue icon+label if never glued

EmphasizedNotificationButton has two ways of rendering the icon and
label:

1. Unglued, where they're set using View's standard methods.

2. Glued, where they're saved and combined into a single Spannable with
   an ImageSpan for the icon.

A small logic error meant that we were "re-gluing" the icon and label on
layout direction updates *even if they weren't glued to start with*, and
gluing a null icon and label gives a blank button instead of the label
the caller already set.

Bug: 330746629
Test: atest NotificationEmphasizedButtonState
Flag: NA
Change-Id: I2160dd17d39bd00a045422e2096d14b9ebb68902

parent 305c2765

core/java/com/android/internal/widget/EmphasizedNotificationButton.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,8 @@ public class EmphasizedNotificationButton extends Button {
		+ "gluedLayoutDirection = " + mGluedLayoutDirection);
		}

		if (layoutDirection != mGluedLayoutDirection) {
		final boolean alreadyGlued = mGluedLayoutDirection != LAYOUT_DIRECTION_UNDEFINED;
		if (alreadyGlued && layoutDirection != mGluedLayoutDirection) {
		if (DEBUG_NEW_ACTION_LAYOUT) {
		Log.d(TAG, "onRtlPropertiesChanged: layout direction changed; regluing");
		}