PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Integrate new version of MDC-android release" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-13 03:14:49 +00:00
committed by Android (Google) Code Review
parent 94f4aeed44 23d3eccfa3
commit d8c11f5236
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/layout/settings_collapsing_base_layout.xml
View File

@@ -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">

5
res/values-night/themes.xml
View File

@@ -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>

7
res/values/themes.xml
View File

@@ -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>