diff --git a/res/layout/widgets_two_pane_sheet.xml b/res/layout/widgets_two_pane_sheet.xml index cd7f2e15b2..f692e24f40 100644 --- a/res/layout/widgets_two_pane_sheet.xml +++ b/res/layout/widgets_two_pane_sheet.xml @@ -116,6 +116,7 @@ android:clipToOutline="true" android:paddingBottom="36dp" android:background="@drawable/widgets_surface_background" + android:importantForAccessibility="yes" android:id="@+id/right_pane"> + + + + + + + %1$s widgets on left, search and options on right + diff --git a/res/values/strings.xml b/res/values/strings.xml index 5cc4616db9..a4e7ec48aa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -77,6 +77,8 @@ Reach Your Fitness Goals Stay Ahead of the Weather You Might Also Like + + %1$s widgets on right, search and options on left diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java index 5a1ec871ea..3e4d289b8b 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java @@ -200,10 +200,14 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { return false; } }; - packageItemInfo.title = getContext().getString(R.string.suggested_widgets_header_title); + String suggestionsHeaderTitle = getContext().getString( + R.string.suggested_widgets_header_title); + String suggestionsRightPaneTitle = getContext().getString( + R.string.widget_picker_right_pane_accessibility_title, suggestionsHeaderTitle); + packageItemInfo.title = suggestionsHeaderTitle; WidgetsListHeaderEntry widgetsListHeaderEntry = WidgetsListHeaderEntry.create( packageItemInfo, - getContext().getString(R.string.suggested_widgets_header_title), + suggestionsHeaderTitle, mActivityContext.getPopupDataProvider().getRecommendedWidgets()) .withWidgetListShown(); @@ -216,10 +220,12 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { mRightPane.removeAllViews(); mRightPane.addView(mRecommendedWidgetsTable); mRightPaneScrollView.setScrollY(0); + mRightPane.setAccessibilityPaneTitle(suggestionsRightPaneTitle); mSuggestedWidgetsPackageUserKey = PackageUserKey.fromPackageItemInfo(packageItemInfo); mSelectedHeader = mSuggestedWidgetsPackageUserKey; }); mSuggestedWidgetsContainer.addView(mSuggestedWidgetsHeader); + mRightPane.setAccessibilityPaneTitle(suggestionsRightPaneTitle); } @Override @@ -322,6 +328,10 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { mRightPane.removeAllViews(); mRightPane.addView(widgetsRowViewHolder.itemView); mRightPaneScrollView.setScrollY(0); + mRightPane.setAccessibilityPaneTitle( + getContext().getString( + R.string.widget_picker_right_pane_accessibility_title, + contentEntry.mPkgItem.title)); } }; }