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

am 8b525e75: Merge "Switch QuickSettings to new LocationMode setting api." into klp-dev

Browse Source 
* commit '8b525e75a05c693623a88fc49dfc78958858b4d7':
  Switch QuickSettings to new LocationMode setting api.
This commit is contained in:
David Christie
2013-08-21 10:45:05 -07:00
committed by Android Git Automerger
parent 908d9bfafd 8b525e75a0
commit 95ea52f3f1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,15 +123,17 @@ public class LocationController extends BroadcastReceiver {
final ContentResolver cr = mContext.getContentResolver(); final ContentResolver cr = mContext.getContentResolver();
// When enabling location, a user consent dialog will pop up, and the // When enabling location, a user consent dialog will pop up, and the
// setting won't be fully enabled until the user accepts the agreement. // setting won't be fully enabled until the user accepts the agreement.
Settings.Secure.setLocationMasterSwitchEnabled(cr, enabled); int mode = enabled
? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY : Settings.Secure.LOCATION_MODE_OFF;
Settings.Secure.setLocationMode(cr, mode);
} }
/** /**
* Returns true if either gps or network location are enabled in settings. * Returns true if location isn't disabled in settings.
*/ */
public boolean isLocationEnabled() { public boolean isLocationEnabled() {
ContentResolver contentResolver = mContext.getContentResolver(); ContentResolver resolver = mContext.getContentResolver();
return Settings.Secure.isLocationMasterSwitchEnabled(contentResolver); return Settings.Secure.getLocationMode(resolver) != Settings.Secure.LOCATION_MODE_OFF;
} }
/** /**