commit 841964c02bd8dea2c7e6ec0e261899b803a6514b
author Hank Sheng <hanksheng@google.com> Fri May 20 16:27:56 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 20 16:27:56 2022 +0000
tree 334b123c17530bac9488369a579b4e6575ee7dbc
parent fea570f524c660cc5308017f564c05f168aa297f
parent 9a0675cdc9d8921ba1f003dc7953aae082d1c705

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

src/com/android/settings/SetupWizardUtils.java

diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index e0292ef..e0e9073 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -48,6 +48,9 @@
             if (WizardManagerHelper.isAnySetupWizard(intent)) {
                 if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
                     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:
                             return R.style.GlifV3Theme_DayNight;
@@ -60,8 +63,11 @@
                     }
                 } else {
                     switch (theme) {
+                        // TODO(b/233032365): Create glif v4 theme for this case.
+                        case ThemeHelper.THEME_GLIF_V4_LIGHT:
                         case ThemeHelper.THEME_GLIF_V3_LIGHT:
                             return R.style.GlifV3Theme_Light;
+                        case ThemeHelper.THEME_GLIF_V4:
                         case ThemeHelper.THEME_GLIF_V3:
                             return R.style.GlifV3Theme;
                         case ThemeHelper.THEME_GLIF_V2_LIGHT:
@@ -76,6 +82,9 @@
                 }
             } else {
                 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:
                         return R.style.GlifV3Theme;