drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add accessibility string for location quicksetting" into klp-dev

Browse Source
This commit is contained in:
Victoria Lease
2013-10-23 17:56:53 +00:00
committed by Android (Google) Code Review
parent 910c285793 3ac54a3a51
commit 5eb3e07c5d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@ -382,6 +382,8 @@
<string name="accessibility_quick_settings_airplane">Airplane Mode <xliff:g id="state" example="Off">%s</xliff:g>.</string> <string name="accessibility_quick_settings_airplane">Airplane Mode <xliff:g id="state" example="Off">%s</xliff:g>.</string>
<!-- Content description of the bluetooth tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the bluetooth tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_bluetooth">Bluetooth <xliff:g id="state" example="Off">%s</xliff:g>.</string> <string name="accessibility_quick_settings_bluetooth">Bluetooth <xliff:g id="state" example="Off">%s</xliff:g>.</string>
<!-- Content description of the location tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_location">Location <xliff:g id="state" example="Off">%s</xliff:g>.</string>
<!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] --> <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_quick_settings_alarm">Alarm set for <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string> <string name="accessibility_quick_settings_alarm">Alarm set for <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@ -630,8 +630,19 @@ class QuickSettings {
return true; // Consume click return true; // Consume click
}} ); }} );
} }
mModel.addLocationTile(locationTile, mModel.addLocationTile(locationTile, new QuickSettingsModel.RefreshCallback() {
new QuickSettingsModel.BasicRefreshCallback(locationTile)); @Override
public void refreshView(QuickSettingsTileView unused, State state) {
locationTile.setImageResource(state.iconId);
String locationState = mContext.getString(
(state.enabled) ? R.string.accessibility_desc_on
: R.string.accessibility_desc_off);
locationTile.setContentDescription(mContext.getString(
R.string.accessibility_quick_settings_location,
locationState));
locationTile.setText(state.label);
}
});
parent.addView(locationTile); parent.addView(locationTile);
} }