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/SetupEncryptionInterstitial.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/SetupEncryptionInterstitial.java')
| -rw-r--r-- | src/com/android/settings/SetupEncryptionInterstitial.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java index 41782da..09c3bfc 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); } |