[CollapsingToolbarLayout] Refactor multiline rotation fix to address …

…related issue caused by keyboard

PiperOrigin-RevId: 645057096

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

@@ -1174,6 +1174,10 @@ int getPendingAction() {
     return pendingAction;
   }
 
+  void setPendingAction(int pendingAction) {
+    this.pendingAction = pendingAction;
+  }
+
   void resetPendingAction() {
     pendingAction = PENDING_ACTION_NONE;
   }

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

@@ -186,6 +186,8 @@ public class CollapsingToolbarLayout extends FrameLayout {
 
   int currentOffset;
 
+  private int screenOrientation;
+
   @TitleCollapseMode private int titleCollapseMode;
 
   @Nullable WindowInsetsCompat lastInsets;
@@ -208,6 +210,8 @@ public CollapsingToolbarLayout(@NonNull Context context, @Nullable AttributeSet
     // Ensure we are using the correctly themed context rather than the context that was passed in.
     context = getContext();
 
+    screenOrientation = getResources().getConfiguration().orientation;
+
     collapsingTextHelper = new CollapsingTextHelper(this);
     collapsingTextHelper.setTextSizeInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
     collapsingTextHelper.setRtlTextDirectionHeuristicsEnabled(false);
@@ -449,6 +453,25 @@ && isTitleCollapseFadeMode()
   protected void onConfigurationChanged(@NonNull Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
     collapsingTextHelper.maybeUpdateFontWeightAdjustment(newConfig);
+
+    // When the orientation changes with extra multiline height enabled and when collapsed, there
+    // can be an issue where the offset/scroll state is invalid due to the number of lines of text
+    // changing which causes a different height for the collapsing toolbar. We can use a pending
+    // action of collapsed to make sure that the collapsing toolbar stays fully collapsed if it was
+    // fully collapsed prior to screen rotation.
+    if (screenOrientation != newConfig.orientation
+        && extraMultilineHeightEnabled
+        && collapsingTextHelper.getExpansionFraction() == 1f) {
+      ViewParent parent = getParent();
+      if (parent instanceof AppBarLayout) {
+        AppBarLayout appBarLayout = (AppBarLayout) parent;
+        if (appBarLayout.getPendingAction() == AppBarLayout.PENDING_ACTION_NONE) {
+          appBarLayout.setPendingAction(AppBarLayout.PENDING_ACTION_COLLAPSED);
+        }
+      }
+    }
+
+    screenOrientation = newConfig.orientation;
   }
 
   @Override
@@ -599,7 +622,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       updateTextBounds(0, 0, getMeasuredWidth(), getMeasuredHeight(), /* forceRecalculate= */ true);
 
       int lineCount = collapsingTextHelper.getExpandedLineCount();
-      if (lineCount > 1 && collapsingTextHelper.getExpansionFraction() == 0f) {
+      if (lineCount > 1) {
         // Add extra height based on the amount of height beyond the first line of title text.
         int expandedTextHeight = Math.round(collapsingTextHelper.getExpandedTextFullHeight());
         extraMultilineHeight = expandedTextHeight * (lineCount - 1);