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

Merge "Gray recent apps section when location disabled" into klp-dev

Browse Source
This commit is contained in:
Lifu Tang
2013-09-07 01:32:48 +00:00
committed by Android (Google) Code Review
parent fbf2d27635 d3a77665ef
commit 066d04def1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ public class LocationSettings extends LocationSettingsBase
private Switch mSwitch; private Switch mSwitch;
private boolean mValidListener; private boolean mValidListener;
private Preference mLocationMode; private Preference mLocationMode;
private PreferenceCategory mCategoryRecentLocationRequests;
private BatteryStatsHelper mStatsHelper; private BatteryStatsHelper mStatsHelper;
/** Receives UPDATE_INTENT */ /** Receives UPDATE_INTENT */
private BroadcastReceiver mReceiver; private BroadcastReceiver mReceiver;
@@ -150,19 +151,19 @@ public class LocationSettings extends LocationSettingsBase
} }
}); });
PreferenceCategory categoryRecentLocationRequests = mCategoryRecentLocationRequests =
(PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS); (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
RecentLocationApps recentApps = new RecentLocationApps(activity, mStatsHelper); RecentLocationApps recentApps = new RecentLocationApps(activity, mStatsHelper);
List<Preference> recentLocationRequests = recentApps.getAppList(); List<Preference> recentLocationRequests = recentApps.getAppList();
if (recentLocationRequests.size() > 0) { if (recentLocationRequests.size() > 0) {
addPreferencesSorted(recentLocationRequests, categoryRecentLocationRequests); addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests);
} else { } else {
// If there's no item to display, add a "No recent apps" item. // If there's no item to display, add a "No recent apps" item.
Preference banner = new Preference(activity); Preference banner = new Preference(activity);
banner.setLayoutResource(R.layout.location_list_no_item); banner.setLayoutResource(R.layout.location_list_no_item);
banner.setTitle(R.string.location_no_recent_apps); banner.setTitle(R.string.location_no_recent_apps);
banner.setSelectable(false); banner.setSelectable(false);
categoryRecentLocationRequests.addPreference(banner); mCategoryRecentLocationRequests.addPreference(banner);
} }
addAppSettings(activity, root); addAppSettings(activity, root);
@@ -256,6 +257,7 @@ public class LocationSettings extends LocationSettingsBase
boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF); boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);
mSwitch.setEnabled(!restricted); mSwitch.setEnabled(!restricted);
mLocationMode.setEnabled(enabled && !restricted); mLocationMode.setEnabled(enabled && !restricted);
mCategoryRecentLocationRequests.setEnabled(enabled);
if (enabled != mSwitch.isChecked()) { if (enabled != mSwitch.isChecked()) {
// set listener to null so that that code below doesn't trigger onCheckedChanged() // set listener to null so that that code below doesn't trigger onCheckedChanged()