summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Miranda <jonmiranda@google.com>2016-09-19 23:04:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-19 23:04:11 +0000
commit41be5cdea5b21c496aadffb6ad4793f6bffd77fe (patch)
treee814e28e25a96c45da997dcbd2c4b9a3129b4c09
parent48542731c562be7f4f41db0e16bbf0390285fb17 (diff)
parent6c61323998edccbc28dc9f31602594e4f32e1215 (diff)
downloadandroid_packages_apps_Trebuchet-41be5cdea5b21c496aadffb6ad4793f6bffd77fe.tar.gz
android_packages_apps_Trebuchet-41be5cdea5b21c496aadffb6ad4793f6bffd77fe.tar.bz2
android_packages_apps_Trebuchet-41be5cdea5b21c496aadffb6ad4793f6bffd77fe.zip
Merge "Add context to widget dimensions for accessibility." into ub-launcher3-calgary-polish
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/launcher3/widget/WidgetCell.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d11d5a56d..60a37e5ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,6 +46,8 @@
<!-- The format string for the dimensions of a widget in the drawer -->
<!-- There is a special version of this format string for Farsi -->
<string name="widget_dims_format">%1$d \u00d7 %2$d</string>
+ <!-- Accessibility spoken message format for the dimensions of a widget in the drawer -->
+ <string name="widget_accessible_dims_format">%1$d wide by %2$d high</string>
<!-- All Apps -->
<!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 97877fd35..293585dd6 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -135,6 +135,8 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener {
mWidgetName.setText(mItem.label);
mWidgetDims.setText(getContext().getString(R.string.widget_dims_format,
mItem.spanX, mItem.spanY));
+ mWidgetDims.setContentDescription(getContext().getString(
+ R.string.widget_accessible_dims_format, mItem.spanX, mItem.spanY));
mWidgetPreviewLoader = loader;
if (item.activityInfo != null) {