From e5557a972ca190cb82026a5dd0c53f4d119fa05a Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 15 Aug 2014 19:59:23 +0200 Subject: Fixed accessibility issues with quick settings The dual mode tiles now have better accessibility descriptions, where the label is now seperate from the clickable button. Also fixed an anouncment problem with the battery indicators. Finally fixed an issue where GPRS null was anounced when no signal was available. Bug: 15682124 Bug: 15696954 Change-Id: Ica2b70173e64d51747b100d0b686875fc8076e6f --- packages/SystemUI/src/com/android/systemui/qs/QSTile.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages/SystemUI/src/com/android/systemui/qs/QSTile.java') diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 6975541..409cc46 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -286,6 +286,7 @@ public abstract class QSTile implements Listenable { public Drawable icon; public String label; public String contentDescription; + public String dualLabelContentDescription; public boolean copyTo(State other) { if (other == null) throw new IllegalArgumentException(); @@ -294,12 +295,15 @@ public abstract class QSTile implements Listenable { || other.iconId != iconId || !Objects.equals(other.icon, icon) || !Objects.equals(other.label, label) - || !Objects.equals(other.contentDescription, contentDescription); + || !Objects.equals(other.contentDescription, contentDescription) + || !Objects.equals(other.dualLabelContentDescription, + dualLabelContentDescription); other.visible = visible; other.iconId = iconId; other.icon = icon; other.label = label; other.contentDescription = contentDescription; + other.dualLabelContentDescription = dualLabelContentDescription; return changed; } @@ -315,6 +319,7 @@ public abstract class QSTile implements Listenable { sb.append(",icon=").append(icon); sb.append(",label=").append(label); sb.append(",contentDescription=").append(contentDescription); + sb.append(",dualLabelContentDescription=").append(dualLabelContentDescription); return sb.append(']'); } } -- cgit v1.1