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

Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hank Sheng
2022-05-20 16:49:13 +00:00
committed by Automerger Merge Worker
parent 4ffd6caf54 841964c02b
commit 37c36d0c63
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/SetupWizardUtils.java
View File

@@ -48,6 +48,9 @@ public class SetupWizardUtils {
if (WizardManagerHelper.isAnySetupWizard(intent)) { if (WizardManagerHelper.isAnySetupWizard(intent)) {
if (ThemeHelper.isSetupWizardDayNightEnabled(context)) { if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
switch (theme) { switch (theme) {
// TODO(b/233032365): Create glif v4 theme for this case.
case ThemeHelper.THEME_GLIF_V4_LIGHT:
case ThemeHelper.THEME_GLIF_V4:
case ThemeHelper.THEME_GLIF_V3_LIGHT: case ThemeHelper.THEME_GLIF_V3_LIGHT:
case ThemeHelper.THEME_GLIF_V3: case ThemeHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme_DayNight; return R.style.GlifV3Theme_DayNight;
@@ -60,8 +63,11 @@ public class SetupWizardUtils {
} }
} else { } else {
switch (theme) { switch (theme) {
// TODO(b/233032365): Create glif v4 theme for this case.
case ThemeHelper.THEME_GLIF_V4_LIGHT:
case ThemeHelper.THEME_GLIF_V3_LIGHT: case ThemeHelper.THEME_GLIF_V3_LIGHT:
return R.style.GlifV3Theme_Light; return R.style.GlifV3Theme_Light;
case ThemeHelper.THEME_GLIF_V4:
case ThemeHelper.THEME_GLIF_V3: case ThemeHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme; return R.style.GlifV3Theme;
case ThemeHelper.THEME_GLIF_V2_LIGHT: case ThemeHelper.THEME_GLIF_V2_LIGHT:
@@ -76,6 +82,9 @@ public class SetupWizardUtils {
} }
} else { } else {
switch (theme) { switch (theme) {
// TODO(b/233032365): Create glif v4 theme for this case.
case ThemeHelper.THEME_GLIF_V4_LIGHT:
case ThemeHelper.THEME_GLIF_V4:
case ThemeHelper.THEME_GLIF_V3_LIGHT: case ThemeHelper.THEME_GLIF_V3_LIGHT:
case ThemeHelper.THEME_GLIF_V3: case ThemeHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme; return R.style.GlifV3Theme;