diff options
| author | Lifu Tang <lifu@google.com> | 2013-09-06 18:35:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-06 18:35:35 -0700 |
| commit | 1cae5d35b257d2ba7c018ceb87c22496bc189147 (patch) | |
| tree | bc69261d1b5c11d12e4bb8eb2ef5ae985655d03f /src/com | |
| parent | 0c6eb1e773ca0d095d4b284950e07807a3c1f613 (diff) | |
| parent | 066d04def1325b97e90f1aaff77e532bf299d938 (diff) | |
| download | packages_apps_Settings-1cae5d35b257d2ba7c018ceb87c22496bc189147.zip packages_apps_Settings-1cae5d35b257d2ba7c018ceb87c22496bc189147.tar.gz packages_apps_Settings-1cae5d35b257d2ba7c018ceb87c22496bc189147.tar.bz2 | |
am 066d04de: Merge "Gray recent apps section when location disabled" into klp-dev
* commit '066d04def1325b97e90f1aaff77e532bf299d938':
Gray recent apps section when location disabled
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/location/LocationSettings.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 06b5dec..add82c6 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -61,6 +61,7 @@ public class LocationSettings extends LocationSettingsBase private Switch mSwitch; private boolean mValidListener; private Preference mLocationMode; + private PreferenceCategory mCategoryRecentLocationRequests; private BatteryStatsHelper mStatsHelper; /** Receives UPDATE_INTENT */ private BroadcastReceiver mReceiver; @@ -150,19 +151,19 @@ public class LocationSettings extends LocationSettingsBase } }); - PreferenceCategory categoryRecentLocationRequests = + mCategoryRecentLocationRequests = (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS); RecentLocationApps recentApps = new RecentLocationApps(activity, mStatsHelper); List<Preference> recentLocationRequests = recentApps.getAppList(); if (recentLocationRequests.size() > 0) { - addPreferencesSorted(recentLocationRequests, categoryRecentLocationRequests); + addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests); } else { // If there's no item to display, add a "No recent apps" item. Preference banner = new Preference(activity); banner.setLayoutResource(R.layout.location_list_no_item); banner.setTitle(R.string.location_no_recent_apps); banner.setSelectable(false); - categoryRecentLocationRequests.addPreference(banner); + mCategoryRecentLocationRequests.addPreference(banner); } addAppSettings(activity, root); @@ -256,6 +257,7 @@ public class LocationSettings extends LocationSettingsBase boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF); mSwitch.setEnabled(!restricted); mLocationMode.setEnabled(enabled && !restricted); + mCategoryRecentLocationRequests.setEnabled(enabled); if (enabled != mSwitch.isChecked()) { // set listener to null so that that code below doesn't trigger onCheckedChanged() |