summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/location
diff options
context:
space:
mode:
authorLifu Tang <lifu@google.com>2013-09-30 17:03:25 -0700
committerLifu Tang <lifu@google.com>2013-10-01 12:29:17 -0700
commit5ab9fa432d17fe72c74a25770a26d405635cc0f6 (patch)
tree5e505b883e00ac625f4d00914322ac65d174748a /src/com/android/settings/location
parentc6578818d8984a4bb5fcd2d41844fc9e8e7d7a62 (diff)
downloadpackages_apps_Settings-5ab9fa432d17fe72c74a25770a26d405635cc0f6.zip
packages_apps_Settings-5ab9fa432d17fe72c74a25770a26d405635cc0f6.tar.gz
packages_apps_Settings-5ab9fa432d17fe72c74a25770a26d405635cc0f6.tar.bz2
Renamed "App settings" back to "Location services"
- Fix b/10610559 Change-Id: Id98a1b4e8d04238f371322fe6232647fa13b5c4a
Diffstat (limited to 'src/com/android/settings/location')
-rw-r--r--src/com/android/settings/location/LocationSettings.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 7cc6f4c..6a29e99 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -55,7 +55,7 @@ public class LocationSettings extends LocationSettingsBase
/** Key for preference category "Recent location requests" */
private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
/** Key for preference category "Location services" */
- private static final String KEY_APP_SETTINGS = "app_settings";
+ private static final String KEY_LOCATION_SERVICES = "location_services";
private Switch mSwitch;
private boolean mValidListener;
@@ -145,7 +145,7 @@ public class LocationSettings extends LocationSettingsBase
mCategoryRecentLocationRequests.addPreference(banner);
}
- addAppSettings(activity, root);
+ addLocationServices(activity, root);
// Only show the master switch when we're not in multi-pane mode, and not being used as
// Setup Wizard.
@@ -177,11 +177,11 @@ public class LocationSettings extends LocationSettingsBase
* up-to-date after mode changes even if an affected app doesn't send the setting changed
* broadcast.
*/
- private void addAppSettings(Context context, PreferenceScreen root) {
- PreferenceCategory categoryAppSettings =
- (PreferenceCategory) root.findPreference(KEY_APP_SETTINGS);
+ private void addLocationServices(Context context, PreferenceScreen root) {
+ PreferenceCategory categoryLocationServices =
+ (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
final SettingsInjector injector = new SettingsInjector(context);
- List<Preference> appSettings = injector.getInjectedSettings();
+ List<Preference> locationServices = injector.getInjectedSettings();
mReceiver = new BroadcastReceiver() {
@Override
@@ -198,11 +198,11 @@ public class LocationSettings extends LocationSettingsBase
filter.addAction(LocationManager.MODE_CHANGED_ACTION);
context.registerReceiver(mReceiver, filter);
- if (appSettings.size() > 0) {
- addPreferencesSorted(appSettings, categoryAppSettings);
+ if (locationServices.size() > 0) {
+ addPreferencesSorted(locationServices, categoryLocationServices);
} else {
// If there's no item to display, remove the whole category.
- root.removePreference(categoryAppSettings);
+ root.removePreference(categoryLocationServices);
}
}