commit 4fdb7c9f2660bf039036535ca8bc2b211a080615
author Mill Chen <millchen@google.com> Wed Jul 14 04:00:11 2021 +0800
committer Mill Chen <millchen@google.com> Wed Jul 14 21:47:49 2021 +0800
tree 96f068e669faa857898576f46842ddd2046da7d9
parent b5d478b4cc68d6d110ba4095ba494085ac373f6f

Support customize layout in CollapsingToolbarBaseActivity

We introduced the collapsing toolbar on S. To enable this feature needs
to correspondingly adjust the theme that the activity uses. However
these changes might cause some mainline module apps get crashed when
running on R. A customize layout is allowed to use for some cases that
need to roll back to the layout used in R.

Bug: 192395187
Test: visual verified
Change-Id: I9b409842198a2d52a6440cdd9ad68268293681f2

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
index e500196..2f911c4 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
@@ -18,6 +18,7 @@
         "androidx.core_core",
         "com.google.android.material_material",
         "SettingsLibSettingsTransition",
+        "SettingsLibUtils",
     ],
     sdk_version: "system_current",
     min_sdk_version: "29",