am a6ffa4ef: Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev

* commit 'a6ffa4ef021ee35a533bc05205d6add6971cc44a':
  Refresh quicksettings location tile text when language changes -b/11157526
This commit is contained in:
David Christie
2013-10-14 17:51:37 -07:00
committed by Android Git Automerger

View File

@@ -310,6 +310,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
refreshBrightnessTile(); refreshBrightnessTile();
refreshRotationLockTile(); refreshRotationLockTile();
refreshRssiTile(); refreshRssiTile();
refreshLocationTile();
} }
// Settings // Settings
@@ -582,6 +583,12 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
mLocationCallback.refreshView(mLocationTile, mLocationState); mLocationCallback.refreshView(mLocationTile, mLocationState);
} }
void refreshLocationTile() {
if (mLocationTile != null) {
onLocationSettingsChanged(mLocationState.enabled);
}
}
@Override @Override
public void onLocationSettingsChanged(boolean locationEnabled) { public void onLocationSettingsChanged(boolean locationEnabled) {
int textResId = locationEnabled ? R.string.quick_settings_location_label int textResId = locationEnabled ? R.string.quick_settings_location_label