From ffd525d8eb9dbe1bc4d87909b01371743c296a16 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Tue, 22 May 2018 23:54:53 -0700
Subject: Delete AppCompatConstants

Test: Existing tests
PiperOrigin-RevId: 197681266
Change-Id: I27fdda1d5c252993795b6eb860663c8cab0d363c
---
 .../dialer/calllogutils/CallTypeHelper.java        | 24 +++++++++++-----------
 .../dialer/calllogutils/CallTypeIconsView.java     | 14 ++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'java/com/android/dialer/calllogutils')

diff --git a/java/com/android/dialer/calllogutils/CallTypeHelper.java b/java/com/android/dialer/calllogutils/CallTypeHelper.java
index 6feaeb998..1bcaa317b 100644
--- a/java/com/android/dialer/calllogutils/CallTypeHelper.java
+++ b/java/com/android/dialer/calllogutils/CallTypeHelper.java
@@ -17,7 +17,7 @@
 package com.android.dialer.calllogutils;
 
 import android.content.res.Resources;
-import com.android.dialer.compat.AppCompatConstants;
+import android.provider.CallLog.Calls;
 import com.android.dialer.duo.Duo;
 
 /** Helper class to perform operations related to call types. */
@@ -87,17 +87,17 @@ public class CallTypeHelper {
   }
 
   public static boolean isMissedCallType(int callType) {
-    return (callType != AppCompatConstants.CALLS_INCOMING_TYPE
-        && callType != AppCompatConstants.CALLS_OUTGOING_TYPE
-        && callType != AppCompatConstants.CALLS_VOICEMAIL_TYPE
-        && callType != AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE);
+    return (callType != Calls.INCOMING_TYPE
+        && callType != Calls.OUTGOING_TYPE
+        && callType != Calls.VOICEMAIL_TYPE
+        && callType != Calls.ANSWERED_EXTERNALLY_TYPE);
   }
 
   /** Returns the text used to represent the given call type. */
   public CharSequence getCallTypeText(
       int callType, boolean isVideoCall, boolean isPulledCall, boolean isDuoCall) {
     switch (callType) {
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
+      case Calls.INCOMING_TYPE:
         if (isVideoCall) {
           if (isPulledCall) {
             return incomingVideoPulledName;
@@ -115,7 +115,7 @@ public class CallTypeHelper {
           }
         }
 
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
+      case Calls.OUTGOING_TYPE:
         if (isVideoCall) {
           if (isPulledCall) {
             return outgoingVideoPulledName;
@@ -133,23 +133,23 @@ public class CallTypeHelper {
           }
         }
 
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
         if (isVideoCall) {
           return missedVideoName;
         } else {
           return missedName;
         }
 
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
+      case Calls.VOICEMAIL_TYPE:
         return voicemailName;
 
-      case AppCompatConstants.CALLS_REJECTED_TYPE:
+      case Calls.REJECTED_TYPE:
         return rejectedName;
 
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
+      case Calls.BLOCKED_TYPE:
         return blockedName;
 
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
         return answeredElsewhereName;
 
       default:
diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
index 1df615f9c..990fa7314 100644
--- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java
+++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
@@ -23,10 +23,10 @@ import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.provider.CallLog.Calls;
 import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.View;
-import com.android.dialer.compat.AppCompatConstants;
 import com.android.dialer.theme.base.ThemeUtil;
 import java.util.ArrayList;
 import java.util.List;
@@ -167,16 +167,16 @@ public class CallTypeIconsView extends View {
   private Drawable getCallTypeDrawable(int callType) {
     Resources resources = useLargeIcons ? largeResouces : CallTypeIconsView.resources;
     switch (callType) {
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
+      case Calls.INCOMING_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
         return resources.incoming;
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
+      case Calls.OUTGOING_TYPE:
         return resources.outgoing;
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
         return resources.missed;
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
+      case Calls.VOICEMAIL_TYPE:
         return resources.voicemail;
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
+      case Calls.BLOCKED_TYPE:
         return resources.blocked;
       default:
         // It is possible for users to end up with calls with unknown call types in their
-- 
cgit v1.2.3