diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-05-07 17:34:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-07 17:34:44 -0700 |
| commit | cb5adfe1efb6fb903a743b0bd2c014e41858be31 (patch) | |
| tree | bf3f64f5f80ec8081b62f1b01a540e49cd661638 | |
| parent | 98e030be2abc03e90e9fd9f8bf67e2e01db39cc0 (diff) | |
| parent | 51944f1ba43f46ddb8fa9d89025ff7360fe483f0 (diff) | |
| download | android_packages_apps_Trebuchet-cb5adfe1efb6fb903a743b0bd2c014e41858be31.tar.gz android_packages_apps_Trebuchet-cb5adfe1efb6fb903a743b0bd2c014e41858be31.tar.bz2 android_packages_apps_Trebuchet-cb5adfe1efb6fb903a743b0bd2c014e41858be31.zip | |
Merge "DO NOT MERGE Add content descriptions for workspace cells." into jb-dev
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d9fbba253..1416d40e9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -213,10 +213,13 @@ s --> <!-- Accessibility --> <skip /> + <!-- The format string for Workspace descriptions [CHAR_LIMIT=none] --> + <string name="workspace_description_format">Home screen %1$d</string> + <!-- The format string for default page scroll text [CHAR_LIMIT=none] --> <string name="default_scroll_format">Page %1$d of %2$d</string> <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] --> - <string name="workspace_scroll_format">Workspace %1$d of %2$d</string> + <string name="workspace_scroll_format">Home screen %1$d of %2$d</string> <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] --> <string name="apps_customize_apps_scroll_format">Apps page %1$d of %2$d</string> <!-- The format string for AppsCustomize Apps page scroll text [CHAR_LIMIT=none] --> diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 5e45c99d8..f0d339557 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -442,6 +442,8 @@ public class Workspace extends SmoothPagedView cl.setOnInterceptTouchListener(this); cl.setClickable(true); cl.enableHardwareLayers(); + cl.setContentDescription(getContext().getString( + R.string.workspace_description_format, getChildCount())); } @Override |