Integrate new version of MDC-android release
1. Add color fill on scroll
2. Add collapsing title fading
Bug: 183496853
Test: visual verified
Change-Id: I5d0ae0b10d9f0eae843cd4935c075488a960d3f3
diff --git a/res/layout/settings_collapsing_base_layout.xml b/res/layout/settings_collapsing_base_layout.xml
index 7ebf433..ca9c132 100644
--- a/res/layout/settings_collapsing_base_layout.xml
+++ b/res/layout/settings_collapsing_base_layout.xml
@@ -20,24 +20,29 @@
android:id="@+id/content_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:transitionGroup="true">
+ android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
- android:layout_height="180dp"
+ android:layout_height="wrap_content"
+ android:fitsSystemWindows="true"
+ android:outlineAmbientShadowColor="@android:color/transparent"
+ android:outlineSpotShadowColor="@android:color/transparent"
+ android:background="?android:attr/colorPrimary"
android:theme="@style/Theme.CollapsingToolbar.Settings">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
- android:background="?android:attr/colorPrimary"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="226dp"
app:maxLines="3"
- app:contentScrim="?android:attr/colorPrimary"
+ app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
+ app:scrimAnimationDuration="150"
+ app:scrimVisibleHeightTrigger="174dp"
+ app:statusBarScrim="@empty"
+ app:titleCollapseMode="fade"
app:collapsedTitleTextAppearance="@style/ToolbarText.Collapsed"
- app:statusBarScrim="?android:attr/colorPrimary"
- app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:expandedTitleMarginStart="18dp"
app:expandedTitleMarginEnd="16dp"
app:toolbarId="@id/action_bar">
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index a4f495a..604610d 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -45,8 +45,9 @@
<item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>
</style>
- <style name="Theme.CollapsingToolbar.Settings"
- parent="@style/Theme.MaterialComponents.DayNight">
+ <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
+ <item name="elevationOverlayEnabled">true</item>
+ <item name="elevationOverlayColor">?attr/colorPrimary</item>
<item name="colorPrimary">@*android:color/primary_dark_device_default_settings</item>
<item name="colorAccent">@*android:color/accent_device_default_dark</item>
</style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d7b3257..4df4a78 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -74,6 +74,8 @@
<item name="android:actionBarStyle">@style/Widget.ActionBar.SubSettings</item>
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
+ <item name="android:navigationBarColor">@android:color/transparent</item>
+ <item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
@@ -272,8 +274,9 @@
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
</style>
- <style name="Theme.CollapsingToolbar.Settings"
- parent="@style/Theme.MaterialComponents.DayNight">
+ <style name="Theme.CollapsingToolbar.Settings" parent="@style/Theme.MaterialComponents.DayNight">
+ <item name="elevationOverlayEnabled">true</item>
+ <item name="elevationOverlayColor">?attr/colorPrimary</item>
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item>
</style>