diff options
author | Filip Pavlis <pavlis@google.com> | 2018-03-29 15:03:17 +0100 |
---|---|---|
committer | Filip Pavlis <pavlis@google.com> | 2018-03-29 15:03:17 +0100 |
commit | 838b195b3495f7be9edf460294fbef8745b35b28 (patch) | |
tree | 94c0626462750a2bcedd917af0d661e6baa8629e | |
parent | aab80dec49fb8dbad25189f326c59d9cedbf3435 (diff) | |
download | Email-838b195b3495f7be9edf460294fbef8745b35b28.tar.gz |
Move Email to androidx.
Bug: 76692459
Test: make -j Email
Change-Id: I8c358df31ed578fe77b5962973d09e5c26239255
11 files changed, 22 insertions, 22 deletions
diff --git a/Android.mk b/Android.mk index cfc205b89..78df40d53 100644 --- a/Android.mk +++ b/Android.mk @@ -45,17 +45,17 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ libphotoviewer_appcompat \ android-opt-bitmap \ android-opt-datetimepicker \ - 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 + 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 LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-annotations \ + androidx.annotation_annotation \ android-common \ guava \ owasp-html-sanitizer diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk index fc47652ef..165f30222 100644 --- a/emailcommon/Android.mk +++ b/emailcommon/Android.mk @@ -34,12 +34,12 @@ LOCAL_MODULE := com.android.emailcommon LOCAL_STATIC_JAVA_LIBRARIES := \ guava \ android-common \ - android-support-annotations + androidx.annotation_annotation LOCAL_JAVA_LIBRARIES := \ org.apache.http.legacy -LOCAL_STATIC_ANDROID_LIBRARIES += android-support-compat +LOCAL_STATIC_ANDROID_LIBRARIES += androidx.core_core 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 9d0cae16a..2b6754472 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.ContentUris; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.v4.util.LongSparseArray; +import androidx.collection.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 78b84cc45..2feea0d2e 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.ContentResolver; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.v4.util.LongSparseArray; +import androidx.collection.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 3532689c4..183c0cdd7 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.CalendarContract.SyncState; import android.provider.ContactsContract; import android.provider.ContactsContract.RawContacts; import android.provider.SyncStateContract; -import android.support.annotation.Nullable; +import androidx.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 e92b2eb8c..140d07808 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 --> - <android.support.v7.widget.GridLayout + <androidx.gridlayout.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" /> - </android.support.v7.widget.GridLayout> + </androidx.gridlayout.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 e57b41833..6773f1bee 100644 --- a/src/com/android/email/EmailNotificationController.java +++ b/src/com/android/email/EmailNotificationController.java @@ -32,7 +32,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Process; import android.provider.Settings; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import android.text.TextUtils; import android.text.format.DateUtils; @@ -114,7 +114,7 @@ public class EmailNotificationController implements NotificationController { } /** - * Returns a {@link android.support.v4.app.NotificationCompat.Builder} for an event with the + * Returns a {@link androidx.core.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 30c3d9cb3..a1cea580d 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.preference.PreferenceScreen; import android.provider.CalendarContract; import android.provider.ContactsContract; import android.provider.Settings; -import android.support.annotation.NonNull; +import androidx.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 adaa32aa1..0eabebf09 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.content.Loader; import android.database.Cursor; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.annotation.NonNull; +import androidx.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 cbb47b922..c8e892807 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.app.Fragment; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.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 42ae407dd..eecb797c1 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; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceActivity; import android.preference.PreferenceFragment; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.MenuItem; |