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

Commit 8871138f authored by Joy Babafemi's avatar Joy Babafemi Committed by Android (Google) Code Review
Browse files

Merge "Set dropdown presentation content description programmatically to provider name" into main

parents 79f9b820 6581930b

packages/CredentialManager/res/drawable/more_horiz_24px.xml

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:contentDescription="@string/more_options_content_description"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:contentDescription="@string/provider_icon_content_description"

        android:contentDescription="@string/more_options_content_description"

        android:background="@null"/>

    <TextView

        android:id="@android:id/text1"

packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
            android:id="@android:id/icon1"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:contentDescription="@string/dropdown_presentation_more_sign_in_options_text"

            android:layout_centerVertical="true"

            android:layout_alignParentStart="true"

            android:background="@null"/>

packages/CredentialManager/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -172,5 +172,5 @@ 
  <!-- Strings for dropdown presentation. -->

  <!-- Text shown in the dropdown presentation to select more sign in options. [CHAR LIMIT=120] -->

  <string name="dropdown_presentation_more_sign_in_options_text">Sign-in options</string>

  <string name="provider_icon_content_description">Credential provider icon</string>

  <string name="more_options_content_description">More</string>

</resources>
 
 No newline at end of file

packages/CredentialManager/src/com/android/credentialmanager/common/ui/RemoteViewsFactory.kt

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ class RemoteViewsFactory { 
                    setMaxHeightMethodName,

                    context.resources.getDimensionPixelSize(

                            com.android.credentialmanager.R.dimen.autofill_icon_size));

            remoteViews.setContentDescription(android.R.id.icon1, credentialEntryInfo

                    .providerDisplayName);

            val drawableId =

                    com.android.credentialmanager.R.drawable.fill_dialog_dynamic_list_item_one

            remoteViews.setInt(