From 598be1eab6b6aa76033acb8534330731962e986a Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 8 Apr 2015 21:13:42 -0700 Subject: [PATCH] Add support for material_blue theme Add support for material_blue theme, which setup wizard is going to use for M. This changes SetupWizardUtils.getTheme to always return either SetupWizardTheme or SetupWizardTheme_Light, and added the theme value "material" blue. Bug: 19729981 Change-Id: I63678312af4942be358b92a58b1c84f89aaaa6c1 --- src/com/android/settings/SetupChooseLockGeneric.java | 2 +- src/com/android/settings/SetupChooseLockPassword.java | 2 +- src/com/android/settings/SetupChooseLockPattern.java | 2 +- .../android/settings/SetupEncryptionInterstitial.java | 2 +- .../android/settings/SetupRedactionInterstitial.java | 2 +- src/com/android/settings/SetupWizardUtils.java | 17 ++++++++--------- src/com/android/settings/wifi/WifiSetupActivity.java | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java index a631caf120..a69ae380f6 100644 --- a/src/com/android/settings/SetupChooseLockGeneric.java +++ b/src/com/android/settings/SetupChooseLockGeneric.java @@ -52,7 +52,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java index b9f408e38b..75a4b76747 100644 --- a/src/com/android/settings/SetupChooseLockPassword.java +++ b/src/com/android/settings/SetupChooseLockPassword.java @@ -63,7 +63,7 @@ public class SetupChooseLockPassword extends ChooseLockPassword @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java index 903a2076ce..ed5b61a726 100644 --- a/src/com/android/settings/SetupChooseLockPattern.java +++ b/src/com/android/settings/SetupChooseLockPattern.java @@ -61,7 +61,7 @@ public class SetupChooseLockPattern extends ChooseLockPattern @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 41782dab34..09c3bfc3b7 100644 --- a/src/com/android/settings/SetupEncryptionInterstitial.java +++ b/src/com/android/settings/SetupEncryptionInterstitial.java @@ -62,7 +62,7 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index badfe8dcd9..410804e91c 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -60,7 +60,7 @@ public class SetupRedactionInterstitial extends RedactionInterstitial @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index c35bb15cb2..e83482a9db 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -38,6 +38,8 @@ public class SetupWizardUtils { public static final String THEME_HOLO_LIGHT = "holo_light"; public static final String THEME_MATERIAL = "material"; public static final String THEME_MATERIAL_LIGHT = "material_light"; + public static final String THEME_MATERIAL_BLUE = "material_blue"; + public static final String THEME_MATERIAL_BLUE_LIGHT = "material_blue_light"; public static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode"; @@ -68,17 +70,14 @@ public class SetupWizardUtils { activity.startActivityForResult(nextIntent, NEXT_REQUEST); } - public static int getTheme(Intent intent, int defaultResId) { + public static int getTheme(Intent intent) { final String themeName = intent.getStringExtra(EXTRA_THEME); - int resid = defaultResId; - if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) || - THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) { - resid = R.style.SetupWizardTheme_Light; - } else if (THEME_HOLO.equalsIgnoreCase(themeName) || - THEME_MATERIAL.equalsIgnoreCase(themeName)) { - resid = R.style.SetupWizardTheme; + if (THEME_HOLO.equalsIgnoreCase(themeName) || THEME_MATERIAL.equalsIgnoreCase(themeName) + || THEME_MATERIAL_BLUE.equalsIgnoreCase(themeName)) { + return R.style.SetupWizardTheme; + } else { + return R.style.SetupWizardTheme_Light; } - return resid; } /** diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java index a60945f5b8..155fd936d6 100644 --- a/src/com/android/settings/wifi/WifiSetupActivity.java +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -180,7 +180,7 @@ public class WifiSetupActivity extends WifiPickerActivity @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - resid = SetupWizardUtils.getTheme(getIntent(), resid); + resid = SetupWizardUtils.getTheme(getIntent()); super.onApplyThemeResource(theme, resid, first); } -- 2.11.0