diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-04-04 17:02:46 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-04-04 17:02:46 -0700 |
| commit | 6068967fd946ccfcc8c69a698c0988f6e6f56ea4 (patch) | |
| tree | d0e182c041a16db62f2099116ac0c5afe6823b6f /src/com/android/settings/location | |
| parent | bb16fd836a5347413e592acbffa189156b28bc53 (diff) | |
| download | packages_apps_Settings-6068967fd946ccfcc8c69a698c0988f6e6f56ea4.zip packages_apps_Settings-6068967fd946ccfcc8c69a698c0988f6e6f56ea4.tar.gz packages_apps_Settings-6068967fd946ccfcc8c69a698c0988f6e6f56ea4.tar.bz2 | |
Re-enable the switch into Location Settings
- get rid of that onIsHidingHeaders()
Change-Id: If0b3fc6900f70cb6dfb54094d1b46b44aba6290f
Diffstat (limited to 'src/com/android/settings/location')
| -rw-r--r-- | src/com/android/settings/location/LocationSettings.java | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index b159e99..d862fd7 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -86,24 +86,20 @@ public class LocationSettings extends LocationSettingsBase final SettingsActivity activity = (SettingsActivity) getActivity(); // Only show the master switch when we're not being used as Setup Wizard. - if (!activity.onIsHidingHeaders()) { - 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)); - } + 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)); } @Override public void onStop() { super.onStop(); final SettingsActivity activity = (SettingsActivity) getActivity(); - if (!activity.onIsHidingHeaders()) { - activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM); - activity.getActionBar().setCustomView(null); - } + activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM); + activity.getActionBar().setCustomView(null); } @Override |