From 2d243693625e8dcfc2d8514e1ee47d3f3e588192 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 3 Jun 2020 10:16:45 +0300
Subject: [PATCH] For #7725: Increase info button touch target while keeping
 size.

Also removed unnecessary touch delegate.
---
 .../mozilla/fenix/settings/RadioButtonInfoPreference.kt  | 6 ------
 .../layout/preference_widget_radiobutton_with_info.xml   | 9 +++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt
index e0e4ddcdb..b2389c174 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt
@@ -11,7 +11,6 @@ import androidx.core.content.res.TypedArrayUtils
 import androidx.core.content.withStyledAttributes
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.increaseTapArea
 
 class RadioButtonInfoPreference @JvmOverloads constructor(
     context: Context,
@@ -61,15 +60,10 @@ class RadioButtonInfoPreference @JvmOverloads constructor(
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
         infoView = holder.findViewById(R.id.info_button) as ImageView
-        infoView?.increaseTapArea(EXTRA_TAP_AREA)
         infoView?.setOnClickListener {
             infoClickListener?.invoke()
         }
         infoView?.alpha = if (isEnabled) FULL_ALPHA else HALF_ALPHA
         contentDescription?.let { infoView?.contentDescription = it }
     }
-
-    companion object {
-        const val EXTRA_TAP_AREA = 22
-    }
 }
diff --git a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
index 1d3fffbca..b297e59bd 100644
--- a/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
+++ b/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
@@ -65,10 +65,11 @@
 
     <ImageView
         android:id="@+id/info_button"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="18dp"
-        android:layout_marginEnd="18dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:padding="12dp"
         app:srcCompat="@drawable/ic_info"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"