diff options
| author | Maurice Lam <yukl@google.com> | 2015-04-08 21:13:42 -0700 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2015-04-08 21:13:42 -0700 |
| commit | 598be1eab6b6aa76033acb8534330731962e986a (patch) | |
| tree | f5ad847a41ed3961a28aa3bb1bcde298a5a3cd86 /src/com/android/settings/SetupWizardUtils.java | |
| parent | 4e0fc628f0e53b3f77ea5474f7a273d7af61da4d (diff) | |
| download | packages_apps_Settings-598be1eab6b6aa76033acb8534330731962e986a.zip packages_apps_Settings-598be1eab6b6aa76033acb8534330731962e986a.tar.gz packages_apps_Settings-598be1eab6b6aa76033acb8534330731962e986a.tar.bz2 | |
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
Diffstat (limited to 'src/com/android/settings/SetupWizardUtils.java')
| -rw-r--r-- | src/com/android/settings/SetupWizardUtils.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index c35bb15..e83482a 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; } /** |