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

am 9066b914: Merge "Switch to new location mode API recommended by API council" into klp-dev

Browse Source 
* commit '9066b9140c376cb1b66a3eee830d9dfa177c6056':
  Switch to new location mode API recommended by API council
This commit is contained in:
Tom O'Neill
2013-08-27 08:51:04 -07:00
committed by Android Git Automerger
parent 4d6aaf30ea 9066b9140c
commit ca51ca84f6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package com.android.settings.location; package com.android.settings.location;
import android.content.ContentQueryMap; import android.content.ContentQueryMap;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.os.UserManager; import android.os.UserManager;
@@ -79,13 +78,13 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) { if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
return; return;
} }
Settings.Secure.setLocationMode(getContentResolver(), mode); Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
refreshLocationMode(); refreshLocationMode();
} }
public void refreshLocationMode() { public void refreshLocationMode() {
ContentResolver res = getContentResolver(); int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
int mode = Settings.Secure.getLocationMode(getContentResolver()); Settings.Secure.LOCATION_MODE_OFF);
onModeChanged(mode); onModeChanged(mode);
} }
} }

5
src/com/android/settings/widget/SettingsAppWidgetProvider.java
View File

@@ -521,7 +521,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
@Override @Override
public int getActualState(Context context) { public int getActualState(Context context) {
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
int currentLocationMode = Settings.Secure.getLocationMode(resolver); int currentLocationMode = Settings.Secure.getInt(resolver,
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
switch (currentLocationMode) { switch (currentLocationMode) {
case Settings.Secure.LOCATION_MODE_BATTERY_SAVING: case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
case Settings.Secure.LOCATION_MODE_OFF: case Settings.Secure.LOCATION_MODE_OFF:
@@ -550,7 +551,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
int mode = desiredState int mode = desiredState
? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY ? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY
: Settings.Secure.LOCATION_MODE_BATTERY_SAVING; : Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
Settings.Secure.setLocationMode(resolver, mode); Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
return desiredState; return desiredState;
} }