From c4ab5a4b5ae1074672ea7f7f4a2117c2e95291e2 Mon Sep 17 00:00:00 2001
From: Yi-Ling Chuang <emilychuang@google.com>
Date: Thu, 27 May 2021 16:53:03 +0800
Subject: [PATCH] Make the content animated together with the app bar

Set transitionGroup to the whole page layout so all the content could be
animated in together.

Fixes: 189417218
Test: rebuild and launch All apps page
Change-Id: Ib584fc9ea272b9c61aec3067440fe95435220735
---
 .../res/layout-v31/collapsing_toolbar_base_layout.xml          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml
index 7d9b4d78ce2ac..55de3775bcada 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v31/collapsing_toolbar_base_layout.xml
@@ -21,7 +21,8 @@
     android:id="@+id/content_parent"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"