From f84694f480627d6bfc2857f3d363bb5ea4236a68 Mon Sep 17 00:00:00 2001
From: mdooley <mdooley@google.com>
Date: Fri, 1 Sep 2017 13:09:55 -0700
Subject: Adding dialer specific transcription error codes

These new states will be used to show descriptive failure messages to the user.

Also moved the VoicemailCompat class to avoid duplicate code.

Bug: 37340510
Test: none
PiperOrigin-RevId: 167314611
Change-Id: I618d7f196ea2b0161cbd33479553cae3521328d7
---
 java/com/android/dialer/app/calllog/CallLogAdapter.java   |  3 ++-
 .../dialer/app/calllog/PhoneCallDetailsHelper.java        | 15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

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

diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 61129a7ce..6540b6f95 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -70,6 +70,7 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
+import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
@@ -907,7 +908,7 @@ public class CallLogAdapter extends GroupingListAdapter
     final int transcriptionState =
         (VERSION.SDK_INT >= VERSION_CODES.O)
             ? cursor.getInt(CallLogQuery.TRANSCRIPTION_STATE)
-            : PhoneCallDetailsHelper.TRANSCRIPTION_NOT_STARTED;
+            : VoicemailCompat.TRANSCRIPTION_NOT_STARTED;
     final PhoneCallDetails details =
         new PhoneCallDetails(number, numberPresentation, postDialDigits);
     details.viaNumber = viaNumber;
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
index c1a00e58d..a6e8f10f0 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
@@ -31,6 +31,7 @@ import android.widget.TextView;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.calllogutils.PhoneCallDetails;
+import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
@@ -45,13 +46,6 @@ public class PhoneCallDetailsHelper {
   /** The maximum number of icons will be shown to represent the call types in a group. */
   private static final int MAX_CALL_TYPE_ICONS = 3;
 
-  // TODO(mdooley): remove when these api's become public
-  // Copied from android.provider.VoicemailContract
-  static final int TRANSCRIPTION_NOT_STARTED = 0;
-  static final int TRANSCRIPTION_IN_PROGRESS = 1;
-  static final int TRANSCRIPTION_FAILED = 2;
-  static final int TRANSCRIPTION_AVAILABLE = 3;
-
   private final Context mContext;
   private final Resources mResources;
   private final CallLogCache mCallLogCache;
@@ -159,12 +153,13 @@ public class PhoneCallDetailsHelper {
         // Set the branding text if the voicemail was transcribed by google
         // TODO(mdooley): the transcription state is only set by the google transcription code,
         // but a better solution would be to check the SOURCE_PACKAGE
-        showTranscriptBranding = details.transcriptionState == TRANSCRIPTION_AVAILABLE;
+        showTranscriptBranding =
+            details.transcriptionState == VoicemailCompat.TRANSCRIPTION_AVAILABLE;
       } else {
-        if (details.transcriptionState == TRANSCRIPTION_IN_PROGRESS) {
+        if (details.transcriptionState == VoicemailCompat.TRANSCRIPTION_IN_PROGRESS) {
           views.voicemailTranscriptionView.setText(
               mResources.getString(R.string.voicemail_transcription_in_progress));
-        } else if (details.transcriptionState == TRANSCRIPTION_FAILED) {
+        } else if (details.transcriptionState == VoicemailCompat.TRANSCRIPTION_FAILED) {
           views.voicemailTranscriptionView.setText(
               mResources.getString(R.string.voicemail_transcription_failed));
         }
-- 
cgit v1.2.3