From d4544b75f108f373e32f9c98b3d3c12539064c94 Mon Sep 17 00:00:00 2001 From: David Christie Date: Thu, 8 Aug 2013 14:23:20 -0700 Subject: [PATCH] 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. Change-Id: I78e1337561f72aca81ba5b14321845a0a9d0b597 --- .../statusbar/policy/LocationController.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java index 3f8043d3f5260..a7ce898d97cd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationController.java @@ -125,12 +125,9 @@ public class LocationController extends BroadcastReceiver { return; } final ContentResolver cr = mContext.getContentResolver(); - Settings.Secure.setLocationProviderEnabled( - cr, LocationManager.GPS_PROVIDER, enabled); - // When enabling the NETWORK_PROVIDER, a user consent dialog will pop up, and the - // setting won't actually be enabled until the user accepts the agreement. - Settings.Secure.setLocationProviderEnabled( - cr, LocationManager.NETWORK_PROVIDER, enabled); + // When enabling location, a user consent dialog will pop up, and the + // setting won't be fully enabled until the user accepts the agreement. + Settings.Secure.setLocationMasterSwitchEnabled(cr, enabled); } /** @@ -138,11 +135,7 @@ public class LocationController extends BroadcastReceiver { */ public boolean isLocationEnabled() { ContentResolver contentResolver = mContext.getContentResolver(); - boolean isGpsEnabled = Settings.Secure.isLocationProviderEnabled( - contentResolver, LocationManager.GPS_PROVIDER); - boolean isNetworkEnabled = Settings.Secure.isLocationProviderEnabled( - contentResolver, LocationManager.NETWORK_PROVIDER); - return isGpsEnabled || isNetworkEnabled; + return Settings.Secure.isLocationMasterSwitchEnabled(contentResolver); } @Override