diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0cbecc9c5d..1ac66207b4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -63,7 +63,7 @@
No more room in the Favorites tray
- Apps
+ Apps list
Home
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2d3e8dd04e..a37fe5bc28 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -251,7 +251,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
if (mPageIndicatorViewId > -1) {
mPageIndicator = (PageIndicator) parent.findViewById(mPageIndicatorViewId);
mPageIndicator.setMarkersCount(getChildCount());
- mPageIndicator.setContentDescription(getCurrentPageDescription());
+ mPageIndicator.setContentDescription(getPageIndicatorDescription());
}
}
@@ -442,7 +442,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
private void updatePageIndicator() {
// Update the page indicator (when we aren't reordering)
if (mPageIndicator != null) {
- mPageIndicator.setContentDescription(getCurrentPageDescription());
+ mPageIndicator.setContentDescription(getPageIndicatorDescription());
if (!isReordering(false)) {
mPageIndicator.setActiveMarker(getNextPage());
}
@@ -2276,6 +2276,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
return false;
}
+ protected String getPageIndicatorDescription() {
+ return getCurrentPageDescription();
+ }
+
protected String getCurrentPageDescription() {
return getContext().getString(R.string.default_scroll_format,
getNextPage() + 1, getChildCount());
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index dd54495722..6623367d1b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4409,6 +4409,11 @@ public class Workspace extends PagedView
exitWidgetResizeMode();
}
+ @Override
+ protected String getPageIndicatorDescription() {
+ return getResources().getString(R.string.all_apps_button_label);
+ }
+
@Override
protected String getCurrentPageDescription() {
if (hasCustomContent() && getNextPage() == 0) {