Revert "Move Email to androidx."
Bug: 76692459
This reverts commit 838b195b3495f7be9edf460294fbef8745b35b28.
Change-Id: If7b9e2cf11ba537680ff4c2f550823b9224e1705
diff --git a/Android.mk b/Android.mk
index 78df40d..cfc205b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,17 +45,17 @@
libphotoviewer_appcompat \
android-opt-bitmap \
android-opt-datetimepicker \
- androidx.core_core \
- androidx.media_media \
- androidx.legacy_legacy-support-core-utils \
- androidx.legacy_legacy-support-core-ui \
- androidx.fragment_fragment \
- androidx.appcompat_appcompat \
- androidx.gridlayout_gridlayout \
- androidx.legacy_legacy-support-v13
+ android-support-compat \
+ android-support-media-compat \
+ android-support-core-utils \
+ android-support-core-ui \
+ android-support-fragment \
+ android-support-v7-appcompat \
+ android-support-v7-gridlayout \
+ android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.annotation_annotation \
+ android-support-annotations \
android-common \
guava \
owasp-html-sanitizer
diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk
index 165f302..fc47652 100644
--- a/emailcommon/Android.mk
+++ b/emailcommon/Android.mk
@@ -34,12 +34,12 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
guava \
android-common \
- androidx.annotation_annotation
+ android-support-annotations
LOCAL_JAVA_LIBRARIES := \
org.apache.http.legacy
-LOCAL_STATIC_ANDROID_LIBRARIES += androidx.core_core
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-compat
LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailcommon)
LOCAL_SRC_FILES += \
diff --git a/emailcommon/src/com/android/emailcommon/provider/MessageMove.java b/emailcommon/src/com/android/emailcommon/provider/MessageMove.java
index 2b67544..9d0cae1 100644
--- a/emailcommon/src/com/android/emailcommon/provider/MessageMove.java
+++ b/emailcommon/src/com/android/emailcommon/provider/MessageMove.java
@@ -5,7 +5,7 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import androidx.collection.LongSparseArray;
+import android.support.v4.util.LongSparseArray;
import com.android.mail.utils.LogUtils;
diff --git a/emailcommon/src/com/android/emailcommon/provider/MessageStateChange.java b/emailcommon/src/com/android/emailcommon/provider/MessageStateChange.java
index 2feea0d..78b84cc 100644
--- a/emailcommon/src/com/android/emailcommon/provider/MessageStateChange.java
+++ b/emailcommon/src/com/android/emailcommon/provider/MessageStateChange.java
@@ -4,7 +4,7 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import androidx.collection.LongSparseArray;
+import android.support.v4.util.LongSparseArray;
import com.android.mail.utils.LogUtils;
diff --git a/provider_src/com/android/email/service/EmailServiceUtils.java b/provider_src/com/android/email/service/EmailServiceUtils.java
index 183c0cd..3532689 100644
--- a/provider_src/com/android/email/service/EmailServiceUtils.java
+++ b/provider_src/com/android/email/service/EmailServiceUtils.java
@@ -46,7 +46,7 @@
import android.provider.ContactsContract;
import android.provider.ContactsContract.RawContacts;
import android.provider.SyncStateContract;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.android.email.R;
diff --git a/res/layout-w600dp/account_setup_options_fragment.xml b/res/layout-w600dp/account_setup_options_fragment.xml
index 140d078..e92b2eb 100644
--- a/res/layout-w600dp/account_setup_options_fragment.xml
+++ b/res/layout-w600dp/account_setup_options_fragment.xml
@@ -24,7 +24,7 @@
android:orientation="vertical"
>
<!-- Spinners in a table to line everything up nicely -->
- <androidx.gridlayout.widget.GridLayout
+ <android.support.v7.widget.GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:columnCount="2" >
@@ -56,7 +56,7 @@
app:layout_gravity="center_vertical|fill_horizontal"
android:visibility="gone" />
- </androidx.gridlayout.widget.GridLayout>
+ </android.support.v7.widget.GridLayout>
<CheckBox
android:id="@+id/account_notify"
style="@style/account_setup_checkbox"
diff --git a/src/com/android/email/EmailNotificationController.java b/src/com/android/email/EmailNotificationController.java
index 6773f1b..e57b418 100644
--- a/src/com/android/email/EmailNotificationController.java
+++ b/src/com/android/email/EmailNotificationController.java
@@ -32,7 +32,7 @@
import android.os.Looper;
import android.os.Process;
import android.provider.Settings;
-import androidx.core.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
import android.text.TextUtils;
import android.text.format.DateUtils;
@@ -114,7 +114,7 @@
}
/**
- * Returns a {@link androidx.core.app.NotificationCompat.Builder} for an event with the
+ * Returns a {@link android.support.v4.app.NotificationCompat.Builder} for an event with the
* given account. The account contains specific rules on ring tone usage and these will be used
* to modify the notification behaviour.
*
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index a1cea58..30c3d9c 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -41,7 +41,7 @@
import android.provider.CalendarContract;
import android.provider.ContactsContract;
import android.provider.Settings;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuInflater;
diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index 0eabebf..adaa32a 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -36,7 +36,7 @@
import android.database.Cursor;
import android.os.Bundle;
import android.provider.ContactsContract;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
diff --git a/src/com/android/email/activity/setup/EmailPreferenceActivity.java b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
index c8e8928..cbb47b9 100644
--- a/src/com/android/email/activity/setup/EmailPreferenceActivity.java
+++ b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
@@ -21,7 +21,7 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java
index eecb797..42ae407 100644
--- a/src/com/android/email/activity/setup/MailboxSettings.java
+++ b/src/com/android/email/activity/setup/MailboxSettings.java
@@ -34,7 +34,7 @@
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import android.text.TextUtils;
import android.view.MenuItem;
