Fix background inconsistency of the font size page in SUW
- Apply to SUW provided theme. - Use isSetupWizardDayNightEnabled to decide which device's SUW supports dark mode. Fixes: 184901818 Bug: 186076332 Test: manual test Change-Id: I44c5f8ee19dac58dea7f5543840659c08aad4a39
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
android:shape="rectangle" >
|
android:shape="rectangle" >
|
||||||
<stroke
|
<stroke
|
||||||
android:width="@dimen/preview_pager_padding"
|
android:width="@dimen/preview_pager_padding"
|
||||||
android:color="?android:attr/colorPrimary" />
|
android:color="?android:attr/colorBackground" />
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
<item
|
<item
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
android:shape="rectangle"
|
android:shape="rectangle"
|
||||||
android:height="?android:attr/actionBarSize" >
|
android:height="?android:attr/actionBarSize" >
|
||||||
<solid
|
<solid
|
||||||
android:color="?android:attr/colorPrimary" />
|
android:color="?android:attr/colorBackground" />
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
</layer-list>
|
</layer-list>
|
||||||
|
@@ -17,6 +17,9 @@
|
|||||||
|
|
||||||
<!-- SUW related themes -->
|
<!-- SUW related themes -->
|
||||||
<resources>
|
<resources>
|
||||||
|
<!-- This theme was applied to Settings pages which are running under SUW. -->
|
||||||
|
<style name="SubSettings.SetupWizard" parent="SudThemeGlifV3" />
|
||||||
|
|
||||||
<!-- DayNight themes -->
|
<!-- DayNight themes -->
|
||||||
<style name="GlifTheme.DayNight" parent="GlifTheme" />
|
<style name="GlifTheme.DayNight" parent="GlifTheme" />
|
||||||
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
|
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
|
||||||
|
@@ -243,20 +243,6 @@
|
|||||||
<item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
|
<item name="android:textColorSecondary">@*android:color/secondary_text_light</item>
|
||||||
</style>
|
</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 -->
|
<!-- Material theme for the pages containing TabLayout and ViewPager -->
|
||||||
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
|
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
|
||||||
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
|
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
|
||||||
|
@@ -220,6 +220,9 @@
|
|||||||
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
|
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!-- This theme was applied to Settings pages which are running under SUW. -->
|
||||||
|
<style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
|
||||||
|
|
||||||
<!-- DayNight themes -->
|
<!-- DayNight themes -->
|
||||||
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
|
<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
|
||||||
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
|
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
|
||||||
|
@@ -48,6 +48,7 @@ import com.android.settingslib.drawer.Tile;
|
|||||||
|
|
||||||
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
import com.google.android.material.appbar.CollapsingToolbarLayout;
|
||||||
import com.google.android.setupcompat.util.WizardManagerHelper;
|
import com.google.android.setupcompat.util.WizardManagerHelper;
|
||||||
|
import com.google.android.setupdesign.util.ThemeHelper;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
@@ -90,7 +91,9 @@ public class SettingsBaseActivity extends FragmentActivity {
|
|||||||
// Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
|
// Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
|
||||||
final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
|
final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
|
||||||
if (isAnySetupWizard && this instanceof SubSettings) {
|
if (isAnySetupWizard && this instanceof SubSettings) {
|
||||||
setTheme(R.style.LightTheme_SubSettings_SetupWizard);
|
final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)
|
||||||
|
? R.style.SubSettings_SetupWizard : R.style.SudThemeGlifV3_Light;
|
||||||
|
setTheme(appliedTheme);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)
|
if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)
|
||||||
@@ -201,6 +204,7 @@ public class SettingsBaseActivity extends FragmentActivity {
|
|||||||
/**
|
/**
|
||||||
* SubSetting page should show a toolbar by default. If the page wouldn't show a toolbar,
|
* SubSetting page should show a toolbar by default. If the page wouldn't show a toolbar,
|
||||||
* override this method and return false value.
|
* override this method and return false value.
|
||||||
|
*
|
||||||
* @return ture by default
|
* @return ture by default
|
||||||
*/
|
*/
|
||||||
protected boolean isToolbarEnabled() {
|
protected boolean isToolbarEnabled() {
|
||||||
|
Reference in New Issue
Block a user