Remove obsolete methods in CompatUtils and rename it as "LocaleUtils".

Test: Existing tests
PiperOrigin-RevId: 190516504
Change-Id: I5fa9e123b45beb9728257ecd160a348fb3f4732c

2 files changed, 5 insertions, 5 deletions

diff --git a/java/com/android/dialer/dialpadview/DialpadCharMappings.java b/java/com/android/dialer/dialpadview/DialpadCharMappings.java
index 15793a53f..11975e6ac 100644
--- a/java/com/android/dialer/dialpadview/DialpadCharMappings.java
+++ b/java/com/android/dialer/dialpadview/DialpadCharMappings.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v4.util.SimpleArrayMap;
 import com.android.dialer.common.Assert;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 
 /** A class containing character mappings for the dialpad. */
 public class DialpadCharMappings {
@@ -133,7 +133,7 @@ public class DialpadCharMappings {
    * null if no character-key map for the language code is defined.
    */
   public static SimpleArrayMap<Character, Character> getCharToKeyMap(@NonNull Context context) {
-    return CHAR_TO_KEY_MAPS.get(CompatUtils.getLocale(context).getISO3Language());
+    return CHAR_TO_KEY_MAPS.get(LocaleUtils.getLocale(context).getISO3Language());
   }
 
   /**
@@ -163,7 +163,7 @@ public class DialpadCharMappings {
    * preference or null if no key-characters map for the language code is defined.
    */
   static String[] getKeyToCharsMap(@NonNull Context context) {
-    return KEY_TO_CHAR_MAPS.get(CompatUtils.getLocale(context).getISO3Language());
+    return KEY_TO_CHAR_MAPS.get(LocaleUtils.getLocale(context).getISO3Language());
   }
 
   /** Returns the default key-characters map (the one that uses the Latin alphabet). */
diff --git a/java/com/android/dialer/dialpadview/DialpadView.java b/java/com/android/dialer/dialpadview/DialpadView.java
index 1bd8bad4f..0369b40ca 100644
--- a/java/com/android/dialer/dialpadview/DialpadView.java
+++ b/java/com/android/dialer/dialpadview/DialpadView.java
@@ -41,7 +41,7 @@ import android.widget.TextView;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Locale;
@@ -234,7 +234,7 @@ public class DialpadView extends LinearLayout {
   }
 
   private NumberFormat getNumberFormat() {
-    Locale locale = CompatUtils.getLocale(getContext());
+    Locale locale = LocaleUtils.getLocale(getContext());
 
     // Return the Persian number format if the current language is Persian.
     return "fas".equals(locale.getISO3Language())