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

Merge "Shows correct state when location sharing disabled" into klp-dev

Browse Source
This commit is contained in:
Lifu Tang
2013-09-03 17:01:33 +00:00
committed by Android (Google) Code Review
parent a2aaf0e60f 9294fdb6f8
commit 47aab2eed7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,9 +233,12 @@ public class LocationSettings extends LocationSettingsBase
break; break;
} }
boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted; // Restricted user can't change the location mode, so disable the master switch. But in some
// corner cases, the location might still be enabled. In such case the master switch should
// be disabled but checked.
boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);
mSwitch.setEnabled(!restricted); mSwitch.setEnabled(!restricted);
mLocationMode.setEnabled(enabled); mLocationMode.setEnabled(enabled && !restricted);
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()