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

Commit a24a01fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls a11y - Fix title repetition, min height" into rvc-dev am: 93b7e70d am: e312021b 

Change-Id: Ica96cfb5485f3a003d5bb24f0cd6fb39ef3965c0
parents 68f8ada8 e312021b

packages/SystemUI/res/layout/controls_spinner_item.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:layout_gravity="center"

        android:layout_width="@dimen/controls_header_app_icon_size"

        android:layout_height="@dimen/controls_header_app_icon_size"

        android:contentDescription="@null"

        android:layout_marginEnd="10dp" />



    <TextView

packages/SystemUI/res/layout/controls_with_favorites.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        android:orientation="horizontal"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:minHeight="48dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center">
@@ -43,6 +44,7 @@ 
          android:layout_gravity="center"

          android:layout_width="@dimen/controls_header_app_icon_size"

          android:layout_height="@dimen/controls_header_app_icon_size"

          android:contentDescription="@null"

          android:layout_marginEnd="10dp" />



      <TextView

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+0 −2
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ class ControlsUiControllerImpl @Inject constructor ( 
                .setTint(context.resources.getColor(R.color.control_spinner_dropdown, null))

        }

        parent.requireViewById<ImageView>(R.id.app_icon).apply {

            setContentDescription(selectionItem.getTitle())

            setImageDrawable(selectionItem.icon)

        }
@@ -586,7 +585,6 @@ private class ItemAdapter( 
            setText(item.getTitle())

        }

        view.requireViewById<ImageView>(R.id.app_icon).apply {

            setContentDescription(item.appName)

            setImageDrawable(item.icon)

        }

        return view