Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve content descriptions for volume dialog icons." into nyc-dev

Browse Source 
am: 93bd443

* commit '93bd44300c54de6d62258a4b8353d6cab5f543f1':
  Improve content descriptions for volume dialog icons.

Change-Id: I9f4deeec191627aa8ca7ee99db6d3df362f291f5
This commit is contained in:
Julia Reynolds
2016-04-09 00:43:07 +00:00
committed by android-build-merger
parent d6db6b3dc6 93bd44300c
commit eadbe60d59
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1082,6 +1082,10 @@
<string name="volume_stream_limited_dnd" translatable="false">%s — Priority only</string>
<string name="volume_stream_vibrate_dnd" translatable="false">%s vibrate — Priority only</string>
<string name="volume_stream_content_description_unmute">%1$s. Tap to unmute.</string>
<string name="volume_stream_content_description_vibrate">%1$s. Tap to set to vibrate. Accessibility services may be muted.</string>
<string name="volume_stream_content_description_mute">%1$s. Tap to mute. Accessibility services may be muted.</string>
<!-- Name of special SystemUI debug settings -->
<string name="system_ui_tuner">System UI Tuner</string>

32
packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
View File

@@ -761,7 +761,37 @@ public class VolumeDialog implements TunerService.Tunable {
: (iconRes == R.drawable.ic_volume_media_bt || iconRes == row.iconRes)
? Events.ICON_STATE_UNMUTE
: Events.ICON_STATE_UNKNOWN;
row.icon.setContentDescription(ss.name);
if (iconEnabled) {
if (isRingStream) {
if (isRingVibrate) {
row.icon.setContentDescription(mContext.getString(
R.string.volume_stream_content_description_unmute,
ss.name));
} else {
if (mController.hasVibrator()) {
row.icon.setContentDescription(mContext.getString(
R.string.volume_stream_content_description_vibrate,
ss.name));
} else {
row.icon.setContentDescription(mContext.getString(
R.string.volume_stream_content_description_mute,
ss.name));
}
}
} else {
if (ss.muted || mAutomute && ss.level == 0) {
row.icon.setContentDescription(mContext.getString(
R.string.volume_stream_content_description_unmute,
ss.name));
} else {
row.icon.setContentDescription(mContext.getString(
R.string.volume_stream_content_description_mute,
ss.name));
}
}
} else {
row.icon.setContentDescription(ss.name);
}
// update slider
final boolean enableSlider = !zenMuted;