Merge "Move legacy voicemail/error to nui voicemail/listui/error"

29 files changed, 44 insertions, 42 deletions

diff --git a/java/com/android/dialer/app/calllog/CallLogReceiver.java b/java/com/android/dialer/app/calllog/CallLogReceiver.java
index ce3132d12..654436c07 100644
--- a/java/com/android/dialer/app/calllog/CallLogReceiver.java
+++ b/java/com/android/dialer/app/calllog/CallLogReceiver.java
@@ -21,10 +21,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.provider.VoicemailContract;
-import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler;
-import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;
 
 /**
  * Receiver for call log events.
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
index d38ec57a4..e83fcd4c7 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
@@ -33,15 +33,15 @@ import com.android.dialer.app.list.ListsFragment;
 import com.android.dialer.app.voicemail.VoicemailAudioManager;
 import com.android.dialer.app.voicemail.VoicemailErrorManager;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
-import com.android.dialer.app.voicemail.error.VoicemailErrorMessageCreator;
-import com.android.dialer.app.voicemail.error.VoicemailStatus;
-import com.android.dialer.app.voicemail.error.VoicemailStatusWorker;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;
+import com.android.dialer.voicemail.listui.error.VoicemailStatus;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusWorker;
 import java.util.List;
 
 public class VisualVoicemailCallLogFragment extends CallLogFragment {
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index 7c24cc0f0..bbbf056bf 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -36,8 +36,6 @@ import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.CallLogNotificationsService;
 import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
-import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler;
-import com.android.dialer.app.voicemail.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.database.CallLogQueryHandler.Listener;
@@ -48,6 +46,8 @@ import com.android.dialer.logging.UiAction;
 import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 import com.android.dialer.voicemailstatus.VoicemailStatusHelper;
 import java.util.ArrayList;
diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
index 39ef3fab8..ffaf16d18 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
@@ -28,13 +28,13 @@ import android.telephony.TelephonyManager;
 import android.util.ArrayMap;
 import com.android.dialer.app.calllog.CallLogAlertManager;
 import com.android.dialer.app.calllog.CallLogModalAlertManager;
-import com.android.dialer.app.voicemail.error.VoicemailErrorAlert;
-import com.android.dialer.app.voicemail.error.VoicemailErrorMessageCreator;
-import com.android.dialer.app.voicemail.error.VoicemailStatus;
-import com.android.dialer.app.voicemail.error.VoicemailStatusReader;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.CallLogQueryHandler;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorAlert;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;
+import com.android.dialer.voicemail.listui.error.VoicemailStatus;
+import com.android.dialer.voicemail.listui.error.VoicemailStatusReader;
 import com.android.voicemail.VoicemailComponent;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/com/android/dialer/app/voicemail/error/AndroidManifest.xml b/java/com/android/dialer/voicemail/listui/error/AndroidManifest.xml
index 07cb77f58..07cb77f58 100644
--- a/java/com/android/dialer/app/voicemail/error/AndroidManifest.xml
+++ b/java/com/android/dialer/voicemail/listui/error/AndroidManifest.xml
diff --git a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/OmtpVoicemailMessageCreator.java
index 4786ca665..29b698942 100644
--- a/java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/OmtpVoicemailMessageCreator.java
@@ -14,18 +14,18 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.Context;
 import android.preference.PreferenceManager;
 import android.provider.VoicemailContract.Status;
 import android.support.annotation.Nullable;
 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.voicemail.listui.error.VoicemailErrorMessage.Action;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 import java.util.ArrayList;
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorAlert.java
index 7d6665de6..364659d4f 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorAlert.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
@@ -23,9 +23,9 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.dialer.app.alert.AlertManager;
-import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage.Action;
 import java.util.List;
 
 /**
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessage.java
index be7dccda8..14d6cffdc 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessage.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessageCreator.java
index 44ceb893e..43da6afbe 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessageCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.Context;
 import android.os.Build.VERSION;
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatus.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
index a832b5dfb..3447f03df 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatus.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
@@ -14,8 +14,9 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
+import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.database.Cursor;
@@ -118,6 +119,22 @@ public class VoicemailStatus {
     }
   }
 
+  private VoicemailStatus(Builder builder) {
+    sourcePackage = builder.sourcePackage;
+    phoneAccountComponentName = builder.phoneAccountComponentName;
+    phoneAccountId = builder.phoneAccountId;
+    type = builder.type;
+    settingsUri = builder.settingsUri;
+    voicemailAccessUri = builder.voicemailAccessUri;
+    configurationState = builder.configurationState;
+    dataChannelState = builder.dataChannelState;
+    notificationChannelState = builder.notificationChannelState;
+    quotaOccupied = builder.quotaOccupied;
+    quotaTotal = builder.quotaTotal;
+    isAirplaneMode = builder.isAirplaneMode;
+  }
+
+  @TargetApi(VERSION_CODES.O)
   private static int getNotificationChannelStateFormTelephony(
       Context context, PhoneAccountHandle phoneAccountHandle) {
     TelephonyManager telephonyManager =
@@ -137,21 +154,6 @@ public class VoicemailStatus {
     }
   }
 
-  private VoicemailStatus(Builder builder) {
-    sourcePackage = builder.sourcePackage;
-    phoneAccountComponentName = builder.phoneAccountComponentName;
-    phoneAccountId = builder.phoneAccountId;
-    type = builder.type;
-    settingsUri = builder.settingsUri;
-    voicemailAccessUri = builder.voicemailAccessUri;
-    configurationState = builder.configurationState;
-    dataChannelState = builder.dataChannelState;
-    notificationChannelState = builder.notificationChannelState;
-    quotaOccupied = builder.quotaOccupied;
-    quotaTotal = builder.quotaTotal;
-    isAirplaneMode = builder.isAirplaneMode;
-  }
-
   static class Builder {
 
     private String sourcePackage = "";
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
index b357f9a4d..630a17d8f 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusReader.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusReader.java
index fd9e7ef25..cb644c924 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatusReader.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusReader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 /**
  * A source that is generating the voicemail status to show error messages, used by {@link
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
index 95b16e8f3..20e46ee2d 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessage.java b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessage.java
index 86b124419..f6a8f07cc 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessage.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessage.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 /** Voicemail TOS message. */
 public class VoicemailTosMessage extends VoicemailErrorMessage {
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
index a714b6d90..ec1a95a1a 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -37,13 +37,13 @@ import android.text.style.TextAppearanceSpan;
 import android.text.style.URLSpan;
 import android.view.View;
 import android.view.View.OnClickListener;
-import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage.Action;
 import com.android.dialer.voicemail.settings.VoicemailSettingsFragment;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/Vvm3VoicemailMessageCreator.java
index d10c7daf8..17173d82b 100644
--- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/Vvm3VoicemailMessageCreator.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.dialer.app.voicemail.error;
+package com.android.dialer.voicemail.listui.error;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,9 +27,9 @@ import android.support.annotation.RequiresApi;
 import android.view.View;
 import android.view.View.OnClickListener;
 import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage.Action;
 
 /**
  * Create error message from {@link VoicemailStatus} for VVM3 visual voicemail. VVM3 is used only by
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable-hdpi/ic_voicemail_error_24px.png b/java/com/android/dialer/voicemail/listui/error/res/drawable-hdpi/ic_voicemail_error_24px.png
index 1a5744bce..1a5744bce 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable-hdpi/ic_voicemail_error_24px.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable-hdpi/ic_voicemail_error_24px.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable-mdpi/ic_voicemail_error_24px.png b/java/com/android/dialer/voicemail/listui/error/res/drawable-mdpi/ic_voicemail_error_24px.png
index 9936f0be6..9936f0be6 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable-mdpi/ic_voicemail_error_24px.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable-mdpi/ic_voicemail_error_24px.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable-xhdpi/ic_voicemail_error_24px.png b/java/com/android/dialer/voicemail/listui/error/res/drawable-xhdpi/ic_voicemail_error_24px.png
index 9eff40989..9eff40989 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable-xhdpi/ic_voicemail_error_24px.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable-xhdpi/ic_voicemail_error_24px.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png b/java/com/android/dialer/voicemail/listui/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png
index 5b25f7300..5b25f7300 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png b/java/com/android/dialer/voicemail/listui/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png
index d47ee4cdc..d47ee4cdc 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml b/java/com/android/dialer/voicemail/listui/error/res/drawable/shadow.xml
index 925c8d290..925c8d290 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable/shadow.xml
diff --git a/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png b/java/com/android/dialer/voicemail/listui/error/res/drawable/voicemail_tos_image.png
index 48ab3c3c3..48ab3c3c3 100644
--- a/java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png
+++ b/java/com/android/dialer/voicemail/listui/error/res/drawable/voicemail_tos_image.png
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
index 4bea8b152..4bea8b152 100644
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
diff --git a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml
index 4e143a59a..4e143a59a 100644
--- a/java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml b/java/com/android/dialer/voicemail/listui/error/res/values/dimens.xml
index f40cc5f2b..f40cc5f2b 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/dimens.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/dimens.xml
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
index 05082d8d9..05082d8d9 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
diff --git a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
index bf70240b6..bf70240b6 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
diff --git a/packages.mk b/packages.mk
index e2ccf3ef4..ee01cc8b8 100644
--- a/packages.mk
+++ b/packages.mk
@@ -7,7 +7,6 @@ LOCAL_AAPT_FLAGS := \
 	com.android.dialer.about \
 	com.android.dialer.app \
 	com.android.dialer.app.manifests.activities \
-	com.android.dialer.app.voicemail.error \
 	com.android.dialer.assisteddialing \
 	com.android.dialer.assisteddialing.ui \
 	com.android.dialer.backup \
@@ -59,6 +58,7 @@ LOCAL_AAPT_FLAGS := \
 	com.android.dialer.theme \
 	com.android.dialer.util \
 	com.android.dialer.voicemail.listui \
+	com.android.dialer.voicemail.listui.error \
 	com.android.dialer.voicemail.listui.menu \
 	com.android.dialer.voicemail.settings \
 	com.android.dialer.voicemailstatus \