Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers." into klp-dev

Browse Source
This commit is contained in:
David Christie
2013-08-13 01:44:41 +00:00
committed by Android (Google) Code Review
parent 4c73749614 d4544b75f1
commit 69b9eff155
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java
View File

@@ -126,12 +126,9 @@ public class LocationController extends BroadcastReceiver {
return; return;
} }
final ContentResolver cr = mContext.getContentResolver(); final ContentResolver cr = mContext.getContentResolver();
Settings.Secure.setLocationProviderEnabled( // When enabling location, a user consent dialog will pop up, and the
cr, LocationManager.GPS_PROVIDER, enabled); // setting won't be fully enabled until the user accepts the agreement.
// When enabling the NETWORK_PROVIDER, a user consent dialog will pop up, and the Settings.Secure.setLocationMasterSwitchEnabled(cr, enabled);
// setting won't actually be enabled until the user accepts the agreement.
Settings.Secure.setLocationProviderEnabled(
cr, LocationManager.NETWORK_PROVIDER, enabled);
} }
/** /**
@@ -139,11 +136,7 @@ public class LocationController extends BroadcastReceiver {
*/ */
public boolean isLocationEnabled() { public boolean isLocationEnabled() {
ContentResolver contentResolver = mContext.getContentResolver(); ContentResolver contentResolver = mContext.getContentResolver();
boolean isGpsEnabled = Settings.Secure.isLocationProviderEnabled( return Settings.Secure.isLocationMasterSwitchEnabled(contentResolver);
contentResolver, LocationManager.GPS_PROVIDER);
boolean isNetworkEnabled = Settings.Secure.isLocationProviderEnabled(
contentResolver, LocationManager.NETWORK_PROVIDER);
return isGpsEnabled || isNetworkEnabled;
} }
/** /**