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

Commit 9bb83f65 authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Set the widget preview title a11y text to "{widget name} widget"" into sc-dev

parents 9f2674b6 85486d1c

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
    <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>

    <!-- Spoken text for a screen reader. The placeholder text is the widget name.

         [CHAR_LIMIT=none]-->

    <string name="widget_preview_context_description"><xliff:g id="widget_name" example="Calendar month view">%1$s</xliff:g> widget</string>

    <!-- Message to tell the user to press and hold a widget/icon to add it to the home screen.

         [CHAR LIMIT=NONE]  -->

    <string name="add_item_request_drag_hint">Touch &amp; hold the widget to move it around the Home screen</string>

src/com/android/launcher3/widget/WidgetCell.java

+7 −3
Original line number Diff line number Diff line
@@ -180,14 +180,17 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { 
    public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) {

        applyPreviewOnAppWidgetHostView(item);



        Context context = getContext();

        mItem = item;

        mWidgetName.setText(mItem.label);

        mWidgetDims.setText(getContext().getString(R.string.widget_dims_format,

        mWidgetName.setContentDescription(

                context.getString(R.string.widget_preview_context_description, mItem.label));

        mWidgetDims.setText(context.getString(R.string.widget_dims_format,

                mItem.spanX, mItem.spanY));

        mWidgetDims.setContentDescription(getContext().getString(

        mWidgetDims.setContentDescription(context.getString(

                R.string.widget_accessible_dims_format, mItem.spanX, mItem.spanY));

        if (ATLEAST_S && mItem.widgetInfo != null) {

            CharSequence description = mItem.widgetInfo.loadDescription(getContext());

            CharSequence description = mItem.widgetInfo.loadDescription(context);

            if (description != null && description.length() > 0) {

                mWidgetDescription.setText(description);

                mWidgetDescription.setVisibility(VISIBLE);
@@ -238,6 +241,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { 
            NavigableAppWidgetHostView appWidgetHostViewPreview,

            LauncherAppWidgetProviderInfo providerInfo,

            @Nullable RemoteViews remoteViews) {

        appWidgetHostViewPreview.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

        appWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, providerInfo);

        Rect padding;

        DeviceProfile deviceProfile = mActivity.getDeviceProfile();