commit 1b0720b941542d2b51c7e80ac14e8e5307a0a0c9
author Julia Tuttle <juliatuttle@google.com> Fri Mar 22 18:04:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 18:04:37 2024 +0000
tree 2fa9b0a7647e1ee8d970bf0bd5302b57f47873cd
parent 248f57ad9ee032b3e3e1dc242fce5735a1593c44
parent 7f5aea44a97747dbd699c82dea42e21369a439b4

Merge "CallStyle: don't reglue icon+label if never glued" into main

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

diff --git a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
index c07e624..65d5a1f 100644
--- a/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
+++ b/core/java/com/android/internal/widget/EmphasizedNotificationButton.java
@@ -229,7 +229,8 @@
                     + "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");
             }