Merge "Fix background inconsistency of the font size page in SUW" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-04-23 09:21:28 +00:00
committed by Android (Google) Code Review
5 changed files with 13 additions and 17 deletions

View File

@@ -243,20 +243,6 @@
<item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
</style>
<!-- Light theme for those pages inherit SubSettings and launched during setup flow -->
<style name="LightTheme.SubSettings.SetupWizard" parent="@android:style/Theme.DeviceDefault.Light">
<item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">@android:color/white</item>
<item name="android:navigationBarColor">@android:color/white</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="android:navigationBarDividerColor">@*android:color/navigation_bar_divider_device_default_settings</item>
<item name="android:colorPrimary">@android:color/white</item>
<item name="android:colorBackground">@android:color/white</item>
<item name="android:colorPrimaryDark">@android:color/white</item>
<item name="android:colorAccent">@color/material_blue_700</item>
</style>
<!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>

View File

@@ -220,6 +220,9 @@
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
</style>
<!-- This theme was applied to Settings pages which are running under SUW. -->
<style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
<!-- DayNight themes -->
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />