Badge texts correctly for accessibility in Settings

If an app is a managed profile's app then its label should read correctly by TalkBack.
Affected screens: Data Usage, Location, Battery.

Bug:16053981
Change-Id: I393c0ebf56917032d619b1e39b4bf141ee236981
This commit is contained in:
Zoltan Szatmary-Ban
2014-07-23 11:02:46 +01:00
parent f34c350194
commit ebb36ec920
6 changed files with 73 additions and 15 deletions

View File

@@ -819,14 +819,21 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
View title = null;
if (detail.detailLabels != null) {
for (CharSequence label : detail.detailLabels) {
final int n = detail.detailLabels.length;
for (int i = 0; i < n; ++i) {
CharSequence label = detail.detailLabels[i];
CharSequence contentDescription = detail.detailContentDescriptions[i];
title = inflater.inflate(R.layout.data_usage_app_title, mAppTitles, false);
((TextView) title.findViewById(R.id.app_title)).setText(label);
TextView appTitle = (TextView) title.findViewById(R.id.app_title);
appTitle.setText(label);
appTitle.setContentDescription(contentDescription);
mAppTitles.addView(title);
}
} else {
title = inflater.inflate(R.layout.data_usage_app_title, mAppTitles, false);
((TextView) title.findViewById(R.id.app_title)).setText(detail.label);
TextView appTitle = (TextView) title.findViewById(R.id.app_title);
appTitle.setText(detail.label);
appTitle.setContentDescription(detail.contentDescription);
mAppTitles.addView(title);
}
@@ -2222,6 +2229,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
if (detail != null) {
icon.setImageDrawable(detail.icon);
title.setText(detail.label);
title.setContentDescription(detail.contentDescription);
} else {
icon.setImageDrawable(null);
title.setText(null);