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

Commit c7f6c850 authored by Charlie Anderson's avatar Charlie Anderson
Browse files

Revert "Fixes touch targets for several tabs in ThemePicker" 

Revert submission 23410319-themepicker-touch-targets

Reason for revert: b/284500005

Reverted changes: /q/submissionid:23410319-themepicker-touch-targets

Change-Id: I3e3734e4a676829d38c75c39f3c620d804c13e3f
parent e980bd3a

res/layout/clock_size_radio_button_group.xml

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

        android:id="@+id/button_container_small"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:minHeight="48dp"

        android:orientation="horizontal">

        android:orientation="horizontal">





        <RadioButton

        <RadioButton

res/values/dimens.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -180,6 +180,4 @@ 
    <dimen name="small_clock_height">114dp</dimen>

    <dimen name="small_clock_height">114dp</dimen>

    <dimen name="small_clock_padding_top">28dp</dimen>

    <dimen name="small_clock_padding_top">28dp</dimen>

    <dimen name="clock_padding_start">28dp</dimen>

    <dimen name="clock_padding_start">28dp</dimen>



    <dimen name="tab_touch_delegate_height_padding">8dp</dimen>

</resources>
 
</resources>

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -16,17 +16,13 @@ 
 */

 */

package com.android.customization.picker.clock.ui.adapter

package com.android.customization.picker.clock.ui.adapter





import android.graphics.Rect

import android.view.LayoutInflater

import android.view.LayoutInflater

import android.view.TouchDelegate

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import android.widget.TextView

import android.widget.TextView

import androidx.recyclerview.widget.RecyclerView

import androidx.recyclerview.widget.RecyclerView

import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsTabViewModel

import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsTabViewModel

import com.android.wallpaper.R

import com.android.wallpaper.R

import com.android.wallpaper.util.ViewUtils.setupTouchDelegate







/** Adapter for the tab recycler view on the clock settings screen. */

/** Adapter for the tab recycler view on the clock settings screen. */

class ClockSettingsTabAdapter : RecyclerView.Adapter<ClockSettingsTabAdapter.ViewHolder>() {

class ClockSettingsTabAdapter : RecyclerView.Adapter<ClockSettingsTabAdapter.ViewHolder>() {
@@ -58,10 +54,6 @@ class ClockSettingsTabAdapter : RecyclerView.Adapter<ClockSettingsTabAdapter.Vie 
        val item = items[position]

        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.text = item.name

        holder.textView.setupTouchDelegate(

            parentView = holder.itemView,

            heightRes = R.dimen.tab_touch_delegate_height_padding

        )

        holder.textView.setOnClickListener(

        holder.textView.setOnClickListener(

            if (item.onClicked != null) {

            if (item.onClicked != null) {

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

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

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -17,16 +17,13 @@ 




package com.android.customization.picker.color.ui.adapter

package com.android.customization.picker.color.ui.adapter





import android.graphics.Rect

import android.view.LayoutInflater

import android.view.LayoutInflater

import android.view.TouchDelegate

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import android.widget.TextView

import android.widget.TextView

import androidx.recyclerview.widget.RecyclerView

import androidx.recyclerview.widget.RecyclerView

import com.android.customization.picker.color.ui.viewmodel.ColorTypeTabViewModel

import com.android.customization.picker.color.ui.viewmodel.ColorTypeTabViewModel

import com.android.wallpaper.R

import com.android.wallpaper.R

import com.android.wallpaper.util.ViewUtils.setupTouchDelegate





/** Adapts between color type items and views. */

/** Adapts between color type items and views. */

class ColorTypeTabAdapter : RecyclerView.Adapter<ColorTypeTabAdapter.ViewHolder>() {

class ColorTypeTabAdapter : RecyclerView.Adapter<ColorTypeTabAdapter.ViewHolder>() {
@@ -58,10 +55,6 @@ class ColorTypeTabAdapter : RecyclerView.Adapter<ColorTypeTabAdapter.ViewHolder> 
        val item = items[position]

        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.text = item.name

        holder.textView.setupTouchDelegate(

            parentView = holder.itemView,

            heightRes = R.dimen.tab_touch_delegate_height_padding

        )

        holder.textView.setOnClickListener(

        holder.textView.setOnClickListener(

            if (item.onClick != null) {

            if (item.onClick != null) {

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

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

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -17,16 +17,13 @@ 




package com.android.customization.picker.quickaffordance.ui.adapter

package com.android.customization.picker.quickaffordance.ui.adapter





import android.graphics.Rect

import android.view.LayoutInflater

import android.view.LayoutInflater

import android.view.TouchDelegate

import android.view.View

import android.view.View

import android.view.ViewGroup

import android.view.ViewGroup

import android.widget.TextView

import android.widget.TextView

import androidx.recyclerview.widget.RecyclerView

import androidx.recyclerview.widget.RecyclerView

import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceSlotViewModel

import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordanceSlotViewModel

import com.android.wallpaper.R

import com.android.wallpaper.R

import com.android.wallpaper.util.ViewUtils.setupTouchDelegate





/** Adapts between lock screen quick affordance slot items and views. */

/** Adapts between lock screen quick affordance slot items and views. */

class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() {

class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() {
@@ -58,10 +55,6 @@ class SlotTabAdapter : RecyclerView.Adapter<SlotTabAdapter.ViewHolder>() { 
        val item = items[position]

        val item = items[position]

        holder.itemView.isSelected = item.isSelected

        holder.itemView.isSelected = item.isSelected

        holder.textView.text = item.name

        holder.textView.text = item.name

        holder.textView.setupTouchDelegate(

            parentView = holder.itemView,

            heightRes = R.dimen.tab_touch_delegate_height_padding

        )

        holder.textView.setOnClickListener(

        holder.textView.setOnClickListener(

            if (item.onClicked != null) {

            if (item.onClicked != null) {

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

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