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

Merge "Update power widget to represent gps instead of location master." into klp-dev

Browse Source
This commit is contained in:
David Christie
2013-08-22 04:14:56 +00:00
committed by Android (Google) Code Review
parent 25518c3b45 5eed792a76
commit 9fb0ab85a2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,8 +521,14 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
@Override
public int getActualState(Context context) {
ContentResolver resolver = context.getContentResolver();
return Settings.Secure.getLocationMode(resolver) != Settings.Secure.LOCATION_MODE_OFF
? STATE_ENABLED : STATE_DISABLED;
int currentLocationMode = Settings.Secure.getLocationMode(resolver);
switch (currentLocationMode) {
case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
case Settings.Secure.LOCATION_MODE_OFF:
return STATE_DISABLED;
}
return STATE_ENABLED;
}
@Override
@@ -543,13 +549,12 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
int mode = desiredState
? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY
: Settings.Secure.LOCATION_MODE_OFF;
: Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
Settings.Secure.setLocationMode(resolver, mode);
return desiredState;
}
return Settings.Secure.getLocationMode(resolver)
!= Settings.Secure.LOCATION_MODE_OFF;
return getActualState(context) == STATE_ENABLED;
}
@Override