Move legacy voicemail/error to nui voicemail/listui/error
All packages relating to NUI voicemail should be under third_party/java_src/android_app/dialer/java/com/android/dialer/voicemail/listui. Since there is a chance that during NUI development the legacy third_party/java_src/android_app/dialer/java/com/android/dialer/app/voicemail/error might undergo changes, it makes sense to move this package to the nui, so that no changes in the legacy code are missed for nui. This refactoring would also allow us to ensure that the strings do not need to be translated and that most of the code can be re-used for nui by hooking up the fragment and adapter to voicemail/listui/error.
Bug: 71700117
Test: Unit tests
PiperOrigin-RevId: 182868896
Change-Id: I23329654df5ce2bf612101708ed001ca308ae1ac
diff --git a/java/com/android/dialer/app/calllog/CallLogReceiver.java b/java/com/android/dialer/app/calllog/CallLogReceiver.java
index ce3132d..654436c 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.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 d38ec57..e83fcd4 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.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 7c24cc0..bbbf056 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.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.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 39ef3fa..ffaf16d 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.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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/AndroidManifest.xml
rename to 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
similarity index 98%
rename from java/com/android/dialer/app/voicemail/error/OmtpVoicemailMessageCreator.java
rename to java/com/android/dialer/voicemail/listui/error/OmtpVoicemailMessageCreator.java
index 4786ca6..29b6989 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
similarity index 97%
rename from java/com/android/dialer/app/voicemail/error/VoicemailErrorAlert.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailErrorAlert.java
index 7d6665d..364659d 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.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
similarity index 99%
rename from java/com/android/dialer/app/voicemail/error/VoicemailErrorMessage.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessage.java
index be7dccd..14d6cff 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
similarity index 97%
rename from java/com/android/dialer/app/voicemail/error/VoicemailErrorMessageCreator.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailErrorMessageCreator.java
index 44ceb89..43da6af 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
similarity index 98%
rename from java/com/android/dialer/app/voicemail/error/VoicemailStatus.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
index a832b5d..3447f03 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 @@
}
}
+ 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 @@
}
}
- 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
similarity index 98%
rename from java/com/android/dialer/app/voicemail/error/VoicemailStatusCorruptionHandler.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
index b357f9a..630a17d 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
similarity index 94%
rename from java/com/android/dialer/app/voicemail/error/VoicemailStatusReader.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailStatusReader.java
index fd9e7ef..cb644c9 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
similarity index 97%
rename from java/com/android/dialer/app/voicemail/error/VoicemailStatusWorker.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
index 95b16e8..20e46ee 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
similarity index 94%
rename from java/com/android/dialer/app/voicemail/error/VoicemailTosMessage.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailTosMessage.java
index 86b1244..f6a8f07 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
similarity index 99%
rename from java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
rename to java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
index a714b6d..ec1a95a 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.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
similarity index 98%
rename from java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
rename to java/com/android/dialer/voicemail/listui/error/Vvm3VoicemailMessageCreator.java
index d10c7da..17173d8 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.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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable-hdpi/ic_voicemail_error_24px.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable-hdpi/ic_voicemail_error_24px.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable-mdpi/ic_voicemail_error_24px.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable-mdpi/ic_voicemail_error_24px.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable-xhdpi/ic_voicemail_error_24px.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable-xhdpi/ic_voicemail_error_24px.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable-xxhdpi/ic_voicemail_error_24px.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable-xxxhdpi/ic_voicemail_error_24px.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable/shadow.xml
rename to 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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/drawable/voicemail_tos_image.png
rename to java/com/android/dialer/voicemail/listui/error/res/drawable/voicemail_tos_image.png
Binary files differ
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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/layout/voicemail_error_message_fragment.xml
rename to 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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/layout/voicemail_tos_fragment.xml
rename to 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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/values/dimens.xml
rename to 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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/values/strings.xml
rename to 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
similarity index 100%
rename from java/com/android/dialer/app/voicemail/error/res/values/styles.xml
rename to java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
diff --git a/packages.mk b/packages.mk
index e2ccf3e..ee01cc8 100644
--- a/packages.mk
+++ b/packages.mk
@@ -7,7 +7,6 @@
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 @@
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 \
