From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 3 May 2017 10:27:13 -0700
Subject: This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
---
 .../error/OmtpVoicemailMessageCreator.java          | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java')

diff --git a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
index 2b19bd7bb..48602ea33 100644
--- a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
@@ -24,8 +24,8 @@ import android.telecom.PhoneAccountHandle;
 import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PerAccountSharedPreferences;
+import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.logging.nano.DialerImpression;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 import java.util.ArrayList;
@@ -184,8 +184,8 @@ public class OmtpVoicemailMessageCreator {
 
     String title;
     CharSequence message;
-    int enabledImpression;
-    int dismissedImpression;
+    DialerImpression.Type enabledImpression;
+    DialerImpression.Type dismissedImpression;
     String dismissedKey;
 
     if (isFull) {
@@ -237,20 +237,25 @@ public class OmtpVoicemailMessageCreator {
       PerAccountSharedPreferences sharedPreferenceForAccount,
       String title,
       CharSequence message,
-      int impressionToLogOnEnable,
-      int impressionToLogOnDismiss,
+      DialerImpression.Type impressionToLogOnEnable,
+      DialerImpression.Type impressionToLogOnDismiss,
       String preferenceKeyToUpdate) {
     return new VoicemailErrorMessage(
         title,
         message,
+        VoicemailErrorMessage.createTurnArchiveOnAction(
+            context,
+            impressionToLogOnEnable,
+            status,
+            statusReader,
+            voicemailClient,
+            phoneAccountHandle),
         VoicemailErrorMessage.createDismissTurnArchiveOnAction(
             context,
             impressionToLogOnDismiss,
             statusReader,
             sharedPreferenceForAccount,
-            preferenceKeyToUpdate),
-        VoicemailErrorMessage.createTurnArchiveOnAction(
-            context, impressionToLogOnEnable, status, voicemailClient, phoneAccountHandle));
+            preferenceKeyToUpdate));
   }
 
   @Nullable
-- 
cgit v1.2.3