From 565d8b7bcccd924094cceca49fcee45391441f20 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Wed, 5 Mar 2014 17:27:50 -0800 Subject: [PATCH] Fix bug #13327889 Launching Wifi setting using available wifi network ...notification does not show ON/OFF button for wifi - the notification was launching the WifiPickerActivity which is a PreferenceActivity, so take care of this case too. Change-Id: I64f58d4b9f75141626bb6f0266cf2f17fbb39fc7 --- .../android/settings/wifi/WifiSettings.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 41a4905b3f7..a6ef05c9626 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -409,20 +409,26 @@ public class WifiSettings extends RestrictedSettingsFragment final Activity activity = getActivity(); mSwitch = new Switch(activity); + boolean addSwitch = false; if (activity instanceof SettingsActivity) { SettingsActivity sa = (SettingsActivity) activity; - if (!sa.onIsHidingHeaders()) { - final int padding = activity.getResources().getDimensionPixelSize( - R.dimen.action_bar_switch_padding); - mSwitch.setPaddingRelative(0, 0, padding, 0); - activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, - ActionBar.DISPLAY_SHOW_CUSTOM); - activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams( - ActionBar.LayoutParams.WRAP_CONTENT, - ActionBar.LayoutParams.WRAP_CONTENT, - Gravity.CENTER_VERTICAL | Gravity.END)); - } + addSwitch = !sa.onIsHidingHeaders(); + } else if (activity instanceof WifiPickerActivity) { + PreferenceActivity pa = (PreferenceActivity) activity; + addSwitch = pa.onIsHidingHeaders(); + } + + if (addSwitch) { + final int padding = activity.getResources().getDimensionPixelSize( + R.dimen.action_bar_switch_padding); + mSwitch.setPaddingRelative(0, 0, padding, 0); + activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, + ActionBar.DISPLAY_SHOW_CUSTOM); + activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams( + ActionBar.LayoutParams.WRAP_CONTENT, + ActionBar.LayoutParams.WRAP_CONTENT, + Gravity.CENTER_VERTICAL | Gravity.END)); } mWifiEnabler = new WifiEnabler(activity, mSwitch);