Fix CollapsingToolbarLayout title bounds

Caused by AppBarLayout + WindowInset commit, which breaks some incorrect
assumptions in CTL. Fixed by breaking apart ViewOffsetHelper
so that its tracking of layout coordinates, and applying
offsets, are done at different times.

Also fixed catalog's AppBar sample layouts to set IDs,
enabling state restoration to work.

PiperOrigin-RevId: 239592953

Author: chrisbanes

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_collapsing_fragment.xml

@@ -17,16 +17,19 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
   <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/appbarlayout"
       android:layout_width="match_parent"
       android:layout_height="@dimen/cat_topappbar_tall_toolbar_height"
       android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.CollapsingToolbarLayout
+        android:id="@+id/collapsingtoolbarlayout"
         style="?attr/catalogToolbarStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_fragment.xml

@@ -17,11 +17,13 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
   <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/appbarlayout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fitsSystemWindows="true"

catalog/java/io/material/catalog/topappbar/res/layout/cat_topappbar_scrolling_fragment.xml

@@ -17,11 +17,13 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
   <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/appbarlayout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fitsSystemWindows="true">

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

@@ -449,6 +449,11 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
       }
     }
 
+    // Update our child view offset helpers so that they track the correct layout coordinates
+    for (int i = 0, z = getChildCount(); i < z; i++) {
+      getViewOffsetHelper(getChildAt(i)).onViewLayout();
+    }
+
     // Update the collapsed bounds by getting its transformed bounds
     if (collapsingTitleEnabled && dummyView != null) {
       // We only draw the title if the dummy view is being displayed (Toolbar removes
@@ -481,13 +486,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
       }
     }
 
-    // Update our child view offset helpers. This needs to be done after the title has been
-    // setup, so that any Toolbars are in their original position
-    for (int i = 0, z = getChildCount(); i < z; i++) {
-      getViewOffsetHelper(getChildAt(i)).onViewLayout();
-    }
-
-    // Finally, set our minimum height to enable proper AppBarLayout collapsing
+    // Set our minimum height to enable proper AppBarLayout collapsing
     if (toolbar != null) {
       if (collapsingTitleEnabled && TextUtils.isEmpty(collapsingTextHelper.getText())) {
         // If we do not currently have a title, try and grab it from the Toolbar
@@ -501,6 +500,11 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     }
 
     updateScrimVisibility();
+
+    // Apply any view offsets, this should be done at the very end of layout
+    for (int i = 0, z = getChildCount(); i < z; i++) {
+      getViewOffsetHelper(getChildAt(i)).applyOffsets();
+    }
   }
 
   private static int getHeightWithMargins(@NonNull final View view) {

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

@@ -44,6 +44,7 @@ public boolean onLayoutChild(CoordinatorLayout parent, V child, int layoutDirect
       viewOffsetHelper = new ViewOffsetHelper(child);
     }
     viewOffsetHelper.onViewLayout();
+    viewOffsetHelper.applyOffsets();
 
     if (tempTopBottomOffset != 0) {
       viewOffsetHelper.setTopAndBottomOffset(tempTopBottomOffset);

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

@@ -41,16 +41,13 @@ public ViewOffsetHelper(View view) {
     this.view = view;
   }
 
-  public void onViewLayout() {
-    // Now grab the intended top
+  void onViewLayout() {
+    // Grab the original top and left
     layoutTop = view.getTop();
     layoutLeft = view.getLeft();
-
-    // And offset it as needed
-    updateOffsets();
   }
 
-  private void updateOffsets() {
+  void applyOffsets() {
     ViewCompat.offsetTopAndBottom(view, offsetTop - (view.getTop() - layoutTop));
     ViewCompat.offsetLeftAndRight(view, offsetLeft - (view.getLeft() - layoutLeft));
   }
@@ -64,7 +61,7 @@ private void updateOffsets() {
   public boolean setTopAndBottomOffset(int offset) {
     if (verticalOffsetEnabled && offsetTop != offset) {
       offsetTop = offset;
-      updateOffsets();
+      applyOffsets();
       return true;
     }
     return false;
@@ -79,7 +76,7 @@ public boolean setTopAndBottomOffset(int offset) {
   public boolean setLeftAndRightOffset(int offset) {
     if (horizontalOffsetEnabled && offsetLeft != offset) {
       offsetLeft = offset;
-      updateOffsets();
+      applyOffsets();
       return true;
     }
     return false;