Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02848260 authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge "Set accessibility pane title for right pane on updating content." into main

parents 5faed49e 13c67276

res/layout/widgets_two_pane_sheet.xml

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
                        android:clipToOutline="true"

                        android:paddingBottom="36dp"

                        android:background="@drawable/widgets_surface_background"

                        android:importantForAccessibility="yes"

                        android:id="@+id/right_pane">

                        <com.android.launcher3.widget.picker.WidgetsRecommendationTableLayout

                            android:id="@+id/recommended_widget_table"

res/values-ldrtl/strings.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

/*

* Copyright (C) 2008 The Android Open Source Project

*

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

*

*      http://www.apache.org/licenses/LICENSE-2.0

*

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- General -->

    <skip />



    <!-- accessibilityPaneTitle for the right pane when showing suggested widgets. -->

    <string name="widget_picker_right_pane_accessibility_title"><xliff:g id="selected_header" example="Calendar">%1$s</xliff:g> widgets on left, search and options on right</string>

</resources>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
    <string name="fitness_widget_recommendation_category_label">Reach Your Fitness Goals</string>

    <string name="weather_widget_recommendation_category_label">Stay Ahead of the Weather</string>

    <string name="others_widget_recommendation_category_label">You Might Also Like</string>

    <!-- accessibilityPaneTitle for the right pane when showing suggested widgets. -->

    <string name="widget_picker_right_pane_accessibility_title"><xliff:g id="selected_header" example="Calendar">%1$s</xliff:g> widgets on right, search and options on left</string>

    <!-- Label for showing the number of widgets an app has in the full widgets picker.

         [CHAR_LIMIT=25][ICU SYNTAX] -->

    <string name="widgets_count">

src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java

+12 −2
Original line number Diff line number Diff line
@@ -195,10 +195,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();
@@ -211,10 +215,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
@@ -317,6 +323,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));

            }

        };

    }