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

Re-enable the switch into Location Settings

Browse Source 
- get rid of that onIsHidingHeaders()

Change-Id: If0b3fc6900f70cb6dfb54094d1b46b44aba6290f
This commit is contained in:
Fabrice Di Meglio
2014-04-04 17:02:46 -07:00
parent bb16fd836a
commit 6068967fd9
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/location/LocationSettings.java
View File

@@ -86,7 +86,6 @@ public class LocationSettings extends LocationSettingsBase
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
// Only show the master switch when we're not being used as Setup Wizard. // Only show the master switch when we're not being used as Setup Wizard.
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(
@@ -94,17 +93,14 @@ public class LocationSettings extends LocationSettingsBase
ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.END)); Gravity.CENTER_VERTICAL | Gravity.END));
} }
}
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
if (!activity.onIsHidingHeaders()) {
activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM); activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(null); activity.getActionBar().setCustomView(null);
} }
}
@Override @Override
public void onResume() { public void onResume() {