From 7552ff38b1b1d49ddfb89cb16e5a94a0ea476785 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Tue, 18 Mar 2014 15:17:35 -0700 Subject: [PATCH] Improve support for default theme of WifiSetupActivity Default theme can be either dark or light, depending on the app theme in the manifest. When processing extras, the default was always assumed to be dark. Change-Id: I4598ad25ffa69b63fa91cab8b07931ba37ba7676 --- src/com/android/settings/wifi/WifiSetupActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java index 1739750d7dd..70ee56d4c91 100644 --- a/src/com/android/settings/wifi/WifiSetupActivity.java +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -32,9 +32,12 @@ public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHa @Override protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { String themeName = getIntent().getStringExtra(EXTRA_THEME); - if (themeName != null && themeName.equalsIgnoreCase(THEME_HOLO_LIGHT)) { + if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName)) { resid = getResources().getIdentifier(RESOURCE_THEME_LIGHT, "style", getPackageName()); + } else if (THEME_HOLO.equalsIgnoreCase(themeName)) { + resid = getResources().getIdentifier(RESOURCE_THEME_DARK, "style", + getPackageName()); } super.onApplyThemeResource(theme, resid, first); }