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

Commit 605fae1c authored by Charlie Anderson's avatar Charlie Anderson Committed by Android (Google) Code Review
Browse files

Merge "Fixes touch targets for several tabs in ThemePicker by wrapping views... 

Merge "Fixes touch targets for several tabs in ThemePicker by wrapping views in layout" into udc-dev
parents f27b5277 7fd37465

res/layout/clock_size_radio_button_group.xml

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/touch_target_min_height"

        android:orientation="horizontal">



        <RadioButton

res/layout/picker_fragment_tab.xml

+21 −13
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ 
  ~ limitations under the License.

  ~

  -->

<FrameLayout

    android:id="@+id/text_wrapper"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:minWidth="@dimen/touch_target_min_width"

    android:minHeight="@dimen/touch_target_min_height"

    xmlns:android="http://schemas.android.com/apk/res/android">



    <TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -29,3 +35,5 @@ 
        android:background="@drawable/picker_fragment_tab_background"

        android:maxLines="1"

        android:ellipsize="end" />



</FrameLayout>

src/com/android/customization/picker/clock/ui/adapter/ClockSettingsTabAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class ClockSettingsTabAdapter : RecyclerView.Adapter<ClockSettingsTabAdapter.Vie 
        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.setOnClickListener(

        holder.itemView.setOnClickListener(

            if (item.onClicked != null) {

                View.OnClickListener { item.onClicked.invoke() }

            } else {

src/com/android/customization/picker/color/ui/adapter/ColorTypeTabAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class ColorTypeTabAdapter : RecyclerView.Adapter<ColorTypeTabAdapter.ViewHolder> 
        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.setOnClickListener(

        holder.itemView.setOnClickListener(

            if (item.onClick != null) {

                View.OnClickListener { item.onClick.invoke() }

            } else {

src/com/android/customization/picker/quickaffordance/ui/adapter/SlotTabAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() { 
        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.setOnClickListener(

        holder.itemView.setOnClickListener(

            if (item.onClicked != null) {

                View.OnClickListener { item.onClicked.invoke() }

            } else {