From e83fa9c81f97371f5434524bf893d78bc8a1cbce Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 16 Sep 2022 11:41:34 +0100
Subject: [PATCH] removing dialpad reliance on the legacy support library

---
 library/dialpad/build.gradle                                 | 4 ----
 .../java/com/android/dialer/dialpadview/DialpadTextView.java | 4 +---
 .../java/com/android/dialer/widget/ResizingTextEditText.java | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/library/dialpad/build.gradle b/library/dialpad/build.gradle
index 4f4c3393e4..1f91deeeb5 100644
--- a/library/dialpad/build.gradle
+++ b/library/dialpad/build.gradle
@@ -19,10 +19,6 @@ android {
     }
 }
 
-dependencies {
-    implementation "com.android.support:appcompat-v7:28.0.0"
-}
-
 afterEvaluate {
     tasks.findAll { it.name.startsWith("lint") }.each {
         it.enabled = false
diff --git a/library/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java b/library/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
index 992d6cbed2..5b1b7bb5dc 100644
--- a/library/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
+++ b/library/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadTextView.java
@@ -23,8 +23,6 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatTextView;
-
 /**
  * This is a custom text view intended only for rendering the numerals (and star and pound) on the
  * dialpad. TextView has built in top/bottom padding to help account for ascenders/descenders.
@@ -33,7 +31,7 @@ import androidx.appcompat.widget.AppCompatTextView;
  * to a larger default, for the dialpad we use this class to more precisely render characters
  * according to the precise amount of space they need.
  */
-public class DialpadTextView extends AppCompatTextView {
+public class DialpadTextView extends TextView {
 
   private Rect mTextBounds = new Rect();
   private String mTextStr;
diff --git a/library/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java b/library/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
index 6ec1261f15..216175981b 100644
--- a/library/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
+++ b/library/dialpad/src/main/java/com/android/dialer/widget/ResizingTextEditText.java
@@ -20,14 +20,11 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.EditText;
-
-import androidx.appcompat.widget.AppCompatEditText;
-
 import com.android.dialer.dialpadview.R;
 import com.android.dialer.util.ViewUtil;
 
 /** EditText which resizes dynamically with respect to text length. */
-public class ResizingTextEditText extends AppCompatEditText {
+public class ResizingTextEditText extends EditText {
 
   private final int mOriginalTextSize;
   private final int mMinTextSize;