diff options
author | David Christie <dnchrist@google.com> | 2013-08-06 18:20:33 -0700 |
---|---|---|
committer | David Christie <dnchrist@google.com> | 2013-08-08 19:35:31 +0000 |
commit | 681f79900787c2c40751463ddd8f3476f9b40476 (patch) | |
tree | 4082d3962017efd3b0da5d6abda6fc90b0b27bf9 /src | |
parent | b14698ee6063960d48a691add890a5072f89ea2e (diff) | |
download | packages_apps_Settings-681f79900787c2c40751463ddd8f3476f9b40476.tar.gz packages_apps_Settings-681f79900787c2c40751463ddd8f3476f9b40476.tar.bz2 packages_apps_Settings-681f79900787c2c40751463ddd8f3476f9b40476.zip |
Modify Power Widget Gps Icon To Represent Location.
Instead of directly controlling gps on/off, it will
control master location switch on/off.
Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/widget/SettingsAppWidgetProvider.java | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index 5d581d85a..7beb17c65 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -59,7 +59,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { private static final int BUTTON_WIFI = 0; private static final int BUTTON_BRIGHTNESS = 1; private static final int BUTTON_SYNC = 2; - private static final int BUTTON_GPS = 3; + private static final int BUTTON_LOCATION = 3; private static final int BUTTON_BLUETOOTH = 4; // This widget keeps track of two sets of states: @@ -102,7 +102,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { private static final StateTracker sWifiState = new WifiStateTracker(); private static final StateTracker sBluetoothState = new BluetoothStateTracker(); - private static final StateTracker sGpsState = new GpsStateTracker(); + private static final StateTracker sLocationState = new LocationStateTracker(); private static final StateTracker sSyncState = new SyncStateTracker(); private static SettingsObserver sSettingsObserver; @@ -506,24 +506,23 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { } /** - * Subclass of StateTracker for GPS state. + * Subclass of StateTracker for location state. */ - private static final class GpsStateTracker extends StateTracker { - public int getContainerId() { return R.id.btn_gps; } - public int getButtonId() { return R.id.img_gps; } - public int getIndicatorId() { return R.id.ind_gps; } - public int getButtonDescription() { return R.string.gadget_gps; } + private static final class LocationStateTracker extends StateTracker { + public int getContainerId() { return R.id.btn_location; } + public int getButtonId() { return R.id.img_location; } + public int getIndicatorId() { return R.id.ind_location; } + public int getButtonDescription() { return R.string.gadget_location; } public int getButtonImageId(boolean on) { - return on ? R.drawable.ic_appwidget_settings_gps_on_holo - : R.drawable.ic_appwidget_settings_gps_off_holo; + return on ? R.drawable.ic_appwidget_settings_location_on_holo + : R.drawable.ic_appwidget_settings_location_off_holo; } @Override public int getActualState(Context context) { ContentResolver resolver = context.getContentResolver(); - boolean on = Settings.Secure.isLocationProviderEnabled( - resolver, LocationManager.GPS_PROVIDER); - return on ? STATE_ENABLED : STATE_DISABLED; + return Settings.Secure.isLocationMasterSwitchEnabled(resolver) + ? STATE_ENABLED : STATE_DISABLED; } @Override @@ -542,15 +541,11 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE); if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) { - Settings.Secure.setLocationProviderEnabled( - resolver, - LocationManager.GPS_PROVIDER, - desiredState); + Settings.Secure.setLocationMasterSwitchEnabled(resolver, desiredState); return desiredState; } - return Settings.Secure.isLocationProviderEnabled( - resolver, - LocationManager.GPS_PROVIDER); + + return Settings.Secure.isLocationMasterSwitchEnabled(resolver); } @Override @@ -669,8 +664,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { views.setOnClickPendingIntent(R.id.btn_sync, getLaunchPendingIntent(context, BUTTON_SYNC)); - views.setOnClickPendingIntent(R.id.btn_gps, - getLaunchPendingIntent(context, BUTTON_GPS)); + views.setOnClickPendingIntent(R.id.btn_location, + getLaunchPendingIntent(context, BUTTON_LOCATION)); views.setOnClickPendingIntent(R.id.btn_bluetooth, getLaunchPendingIntent(context, BUTTON_BLUETOOTH)); @@ -701,7 +696,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { private static void updateButtons(RemoteViews views, Context context) { sWifiState.setImageViewResources(context, views); sBluetoothState.setImageViewResources(context, views); - sGpsState.setImageViewResources(context, views); + sLocationState.setImageViewResources(context, views); sSyncState.setImageViewResources(context, views); if (getBrightnessMode(context)) { @@ -782,7 +777,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) { sBluetoothState.onActualStateChange(context, intent); } else if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(action)) { - sGpsState.onActualStateChange(context, intent); + sLocationState.onActualStateChange(context, intent); } else if (ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED.equals(action)) { sSyncState.onActualStateChange(context, intent); } else if (intent.hasCategory(Intent.CATEGORY_ALTERNATIVE)) { @@ -794,8 +789,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { toggleBrightness(context); } else if (buttonId == BUTTON_SYNC) { sSyncState.toggleState(context); - } else if (buttonId == BUTTON_GPS) { - sGpsState.toggleState(context); + } else if (buttonId == BUTTON_LOCATION) { + sLocationState.toggleState(context); } else if (buttonId == BUTTON_BLUETOOTH) { sBluetoothState.toggleState(context); } |