[CollapsingToolbarLayout] Fixed RTL text only laying out as RTL when …

…actual text is RTL

PiperOrigin-RevId: 374663684
(cherry picked from commit 841f229)

lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java

@@ -189,6 +189,7 @@ public CollapsingToolbarLayout(@NonNull Context context, @Nullable AttributeSet
 
     collapsingTextHelper = new CollapsingTextHelper(this);
     collapsingTextHelper.setTextSizeInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
+    collapsingTextHelper.setRtlTextDirectionHeuristicsEnabled(false);
 
     elevationOverlayProvider = new ElevationOverlayProvider(context);
 

lib/java/com/google/android/material/internal/CollapsingTextHelper.java

@@ -117,6 +117,7 @@ public final class CollapsingTextHelper {
   @Nullable private CharSequence text;
   @Nullable private CharSequence textToDraw;
   private boolean isRtl;
+  private boolean isRtlTextDirectionHeuristicsEnabled = true;
 
   private boolean useTexture;
   @Nullable private Bitmap expandedTitleTexture;
@@ -522,6 +523,14 @@ public float getExpandedTextSize() {
     return expandedTextSize;
   }
 
+  public void setRtlTextDirectionHeuristicsEnabled(boolean rtlTextDirectionHeuristicsEnabled) {
+    isRtlTextDirectionHeuristicsEnabled = rtlTextDirectionHeuristicsEnabled;
+  }
+
+  public boolean isRtlTextDirectionHeuristicsEnabled() {
+    return isRtlTextDirectionHeuristicsEnabled;
+  }
+
   private void calculateCurrentOffsets() {
     calculateOffsets(expandedFraction);
   }
@@ -840,16 +849,22 @@ private void drawMultilineTransition(@NonNull Canvas canvas, float currentExpand
 
   private boolean calculateIsRtl(@NonNull CharSequence text) {
     final boolean defaultIsRtl = isDefaultIsRtl();
-    return (defaultIsRtl
-        ? TextDirectionHeuristicsCompat.FIRSTSTRONG_RTL
-        : TextDirectionHeuristicsCompat.FIRSTSTRONG_LTR)
-        .isRtl(text, 0, text.length());
+    return isRtlTextDirectionHeuristicsEnabled
+        ? isTextDirectionHeuristicsIsRtl(text, defaultIsRtl)
+        : defaultIsRtl;
   }
 
   private boolean isDefaultIsRtl() {
     return ViewCompat.getLayoutDirection(view) == ViewCompat.LAYOUT_DIRECTION_RTL;
   }
 
+  private boolean isTextDirectionHeuristicsIsRtl(@NonNull CharSequence text, boolean defaultIsRtl) {
+    return (defaultIsRtl
+            ? TextDirectionHeuristicsCompat.FIRSTSTRONG_RTL
+            : TextDirectionHeuristicsCompat.FIRSTSTRONG_LTR)
+        .isRtl(text, 0, text.length());
+  }
+
   private void setInterpolatedTextSize(float textSize) {
     calculateUsingTextSize(textSize);