PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enable on/off switch for Wi-Fi and Bluetooth Settings"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-03 21:02:51 +00:00
committed by Android (Google) Code Review
parent 5de92cca6f 86ea97f452
commit d2693a82ad
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -129,14 +129,12 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
if (activity.onIsHidingHeaders()) { activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
ActionBar.DISPLAY_SHOW_CUSTOM); activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams( ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT, Gravity.CENTER_VERTICAL | Gravity.END));
Gravity.CENTER_VERTICAL | Gravity.END));
}
} }
@Override @Override

7
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -412,12 +412,9 @@ public class WifiSettings extends RestrictedSettingsFragment
final Activity activity = getActivity(); final Activity activity = getActivity();
mSwitch = new Switch(activity); mSwitch = new Switch(activity);
boolean addSwitch = false; boolean addSwitch = true;
if (activity instanceof SettingsActivity) { if (activity instanceof WifiPickerActivity) {
SettingsActivity sa = (SettingsActivity) activity;
addSwitch = sa.onIsHidingHeaders();
} else if (activity instanceof WifiPickerActivity) {
PreferenceActivity pa = (PreferenceActivity) activity; PreferenceActivity pa = (PreferenceActivity) activity;
addSwitch = pa.onIsHidingHeaders(); addSwitch = pa.onIsHidingHeaders();
} }