From 49d1460b978609739c296c5b5380e1967d40532e Mon Sep 17 00:00:00 2001 From: Vasu Nori Date: Wed, 28 Feb 2018 16:25:02 -0800 Subject: [PATCH 1/5] putback go/ag/3671714. Enable content observer notifications even for default SMS app, when the build is for Android Auto Bug: 71633682 Test: tested manually Change-Id: If91f4f7b2a9b46cba4aa516304f0007a06852c50 --- src/com/android/messaging/datamodel/SyncManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/messaging/datamodel/SyncManager.java b/src/com/android/messaging/datamodel/SyncManager.java index b3571bf..41d3dee 100644 --- a/src/com/android/messaging/datamodel/SyncManager.java +++ b/src/com/android/messaging/datamodel/SyncManager.java @@ -17,6 +17,7 @@ package com.android.messaging.datamodel; import android.content.Context; +import android.content.pm.PackageManager; import android.database.ContentObserver; import android.net.Uri; import android.provider.Telephony; @@ -308,6 +309,14 @@ public class SyncManager { // Primary users default SMS app - don't monitor telephony (most changes from this app) mNotifyOnChanges = false; mSyncOnChanges = false; + if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { + // This is default SMS app but on Auto platform, even default SMS app needs + // to be notified of changes because Bluetooth makes changes to Sms database + // (thru ContentProvider). Content Change notifications help the default SMS app + // refresh display with changes, whenever Bluetooth changes data in SMS db. + mNotifyOnChanges = true; + mSyncOnChanges = false; + } } if (mNotifyOnChanges || mSyncOnChanges) { context.getContentResolver().registerContentObserver(Telephony.MmsSms.CONTENT_URI, From 058a0cb454b10e697d337455db5653ac56ff30ec Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Thu, 15 Mar 2018 16:39:52 -0500 Subject: [PATCH 2/5] Fix 'date' so that it does not cause regeneration for unbundled builds Currently a 'tapas' build will regenerate each time with: $(shell date +%m%d%y_%H%M%S) was changed, regenerating... Change-Id: I2eeda1e9dd51a56bf0783f427b4fcf5a1f489254 --- version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.mk b/version.mk index 8811741..ed67dee 100644 --- a/version.mk +++ b/version.mk @@ -108,7 +108,7 @@ version_code_package := $(base_version_major)$(base_version_minor)$(base_version ifdef TARGET_BUILD_APPS ifeq ($(strip $(HAS_BUILD_NUMBER)),false) git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h) - date_string := $(shell date +%m%d%y_%H%M%S) + date_string := $$(date +%m%d%y_%H%M%S) version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density)) else version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density)) From f38a1bdc3c5b47024fe4c605e6a487e5353dfedf Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Mon, 9 Apr 2018 17:17:41 -0700 Subject: [PATCH 3/5] Migrate Messaging to androidx. Test: make messaging Bug: 76692459 Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a --- Android.mk | 20 +++++++++---------- AndroidManifest.xml | 2 +- proguard.flags | 10 +++++----- res/layout/contact_picker_fragment.xml | 4 ++-- res/layout/conversation_fragment.xml | 2 +- res/layout/conversation_list_fragment.xml | 2 +- res/layout/custom_header_view_pager.xml | 2 +- res/layout/people_options_item_view.xml | 2 +- .../share_intent_conversation_list_view.xml | 2 +- src/android/support/v7/mms/ApnException.java | 2 +- .../support/v7/mms/ApnSettingsLoader.java | 2 +- src/android/support/v7/mms/ApnsXmlParser.java | 2 +- .../v7/mms/CarrierConfigValuesLoader.java | 2 +- .../v7/mms/CarrierConfigXmlParser.java | 2 +- .../v7/mms/DefaultApnSettingsLoader.java | 2 +- .../mms/DefaultCarrierConfigValuesLoader.java | 2 +- .../v7/mms/DefaultUserAgentInfoLoader.java | 2 +- .../support/v7/mms/DownloadRequest.java | 2 +- src/android/support/v7/mms/MmsHttpClient.java | 2 +- .../support/v7/mms/MmsHttpException.java | 2 +- src/android/support/v7/mms/MmsManager.java | 2 +- .../support/v7/mms/MmsNetworkException.java | 2 +- .../support/v7/mms/MmsNetworkManager.java | 2 +- src/android/support/v7/mms/MmsRequest.java | 10 +++++----- src/android/support/v7/mms/MmsService.java | 2 +- .../support/v7/mms/MmsXmlResourceParser.java | 2 +- .../support/v7/mms/PhoneNumberHelper.java | 2 +- src/android/support/v7/mms/SendRequest.java | 2 +- .../support/v7/mms/UserAgentInfoLoader.java | 2 +- src/android/support/v7/mms/Utils.java | 2 +- .../support/v7/mms/pdu/AcknowledgeInd.java | 2 +- src/android/support/v7/mms/pdu/Base64.java | 2 +- .../support/v7/mms/pdu/CharacterSets.java | 2 +- .../support/v7/mms/pdu/ContentType.java | 2 +- .../support/v7/mms/pdu/DeliveryInd.java | 2 +- .../v7/mms/pdu/EncodedStringValue.java | 2 +- .../support/v7/mms/pdu/GenericPdu.java | 2 +- .../mms/pdu/InvalidHeaderValueException.java | 2 +- .../support/v7/mms/pdu/MmsException.java | 2 +- .../v7/mms/pdu/MultimediaMessagePdu.java | 2 +- .../support/v7/mms/pdu/NotificationInd.java | 2 +- .../support/v7/mms/pdu/NotifyRespInd.java | 2 +- src/android/support/v7/mms/pdu/PduBody.java | 2 +- .../support/v7/mms/pdu/PduContentTypes.java | 2 +- .../support/v7/mms/pdu/PduHeaders.java | 2 +- src/android/support/v7/mms/pdu/PduParser.java | 2 +- src/android/support/v7/mms/pdu/PduPart.java | 2 +- .../support/v7/mms/pdu/QuotedPrintable.java | 2 +- .../support/v7/mms/pdu/ReadOrigInd.java | 2 +- .../support/v7/mms/pdu/ReadRecInd.java | 2 +- .../support/v7/mms/pdu/RetrieveConf.java | 2 +- src/android/support/v7/mms/pdu/SendConf.java | 2 +- src/android/support/v7/mms/pdu/SendReq.java | 2 +- .../android/messaging/BugleApplication.java | 4 ++-- .../messaging/datamodel/BitmapPool.java | 2 +- .../datamodel/BugleDatabaseOperations.java | 4 ++-- .../datamodel/BugleNotifications.java | 10 +++++----- .../FrequentContactsCursorBuilder.java | 2 +- .../datamodel/MediaScratchFileProvider.java | 2 +- .../datamodel/MessageNotificationState.java | 8 ++++---- .../NoConfirmationSmsSendService.java | 2 +- .../datamodel/NotificationState.java | 2 +- .../datamodel/ParticipantRefresh.java | 2 +- .../messaging/datamodel/SyncManager.java | 2 +- .../datamodel/action/ActionMonitor.java | 2 +- .../datamodel/action/SyncCursorPair.java | 2 +- .../datamodel/action/SyncMessagesAction.java | 2 +- .../datamodel/data/ConversationData.java | 2 +- .../data/ConversationParticipantsData.java | 2 +- .../datamodel/data/MediaPickerData.java | 2 +- .../datamodel/data/ParticipantData.java | 2 +- .../datamodel/data/PendingAttachmentData.java | 2 +- .../datamodel/data/SelfParticipantsData.java | 2 +- .../datamodel/media/CustomVCardEntry.java | 2 +- .../datamodel/media/PoolableImageCache.java | 2 +- .../datamodel/media/VCardResourceEntry.java | 2 +- .../messaging/mmslib/pdu/CharacterSets.java | 2 +- .../messaging/mmslib/pdu/PduComposer.java | 2 +- .../messaging/mmslib/pdu/PduPersister.java | 4 ++-- .../messaging/mmslib/util/AbstractCache.java | 2 +- .../messaging/mmslib/util/PduCache.java | 2 +- .../messaging/receiver/SmsReceiver.java | 8 ++++---- .../messaging/sms/BugleApnSettingsLoader.java | 4 ++-- .../sms/BugleCarrierConfigValuesLoader.java | 2 +- .../sms/BugleUserAgentInfoLoader.java | 2 +- src/com/android/messaging/sms/MmsConfig.java | 2 +- src/com/android/messaging/sms/MmsSender.java | 2 +- .../sms/SmsStorageStatusManager.java | 4 ++-- .../android/messaging/ui/AsyncImageView.java | 2 +- .../ui/AttachmentPreviewFactory.java | 2 +- .../ui/BlockedParticipantListItemView.java | 4 ++-- .../ui/BlockedParticipantsFragment.java | 2 +- .../messaging/ui/BugleActionBarActivity.java | 4 ++-- .../messaging/ui/CursorRecyclerAdapter.java | 8 ++++---- .../messaging/ui/CustomHeaderViewPager.java | 6 +++--- .../messaging/ui/FixedViewPagerAdapter.java | 2 +- .../messaging/ui/PagingAwareViewPager.java | 4 ++-- .../android/messaging/ui/PersonItemView.java | 4 ++-- src/com/android/messaging/ui/SnackBar.java | 4 ++-- .../android/messaging/ui/TestActivity.java | 2 +- .../android/messaging/ui/UIIntentsImpl.java | 6 +++--- .../android/messaging/ui/ViewPagerTabs.java | 4 ++-- .../animation/PopupTransitionAnimation.java | 2 +- ...ViewGroupItemVerticalExplodeAnimation.java | 2 +- .../ui/appsettings/ApnEditorActivity.java | 2 +- .../ui/appsettings/ApnSettingsActivity.java | 2 +- .../ApplicationSettingsActivity.java | 2 +- .../PerSubscriptionSettingsActivity.java | 2 +- .../ui/appsettings/PhoneNumberPreference.java | 4 ++-- .../ui/appsettings/SettingsActivity.java | 2 +- .../AttachmentChooserFragment.java | 2 +- .../ui/contact/ContactDropdownLayouter.java | 4 ++-- .../ui/contact/ContactPickerFragment.java | 6 +++--- .../ui/contact/ContactRecipientAdapter.java | 2 +- .../ContactRecipientAutoCompleteView.java | 2 +- .../ui/conversation/ComposeMessageView.java | 2 +- .../ui/conversation/ConversationActivity.java | 2 +- .../ConversationFastScroller.java | 8 ++++---- .../ui/conversation/ConversationFragment.java | 16 +++++++-------- .../ui/conversation/ConversationInput.java | 2 +- .../ConversationInputManager.java | 2 +- .../ConversationMessageAdapter.java | 2 +- .../conversation/ConversationMessageView.java | 2 +- .../conversation/ConversationSimSelector.java | 2 +- .../AbstractConversationListActivity.java | 2 +- .../ArchivedConversationListActivity.java | 2 +- .../ConversationListActivity.java | 2 +- .../ConversationListAdapter.java | 4 ++-- .../ConversationListFragment.java | 8 ++++---- .../ConversationListItemView.java | 4 ++-- .../ConversationListSwipeHelper.java | 6 +++--- .../MultiSelectActionModeCallback.java | 2 +- .../conversationlist/ShareIntentAdapter.java | 2 +- .../conversationlist/ShareIntentFragment.java | 4 ++-- .../PeopleOptionsItemView.java | 2 +- .../ui/mediapicker/CameraManager.java | 2 +- .../ui/mediapicker/GalleryGridView.java | 2 +- .../ui/mediapicker/GalleryMediaChooser.java | 2 +- .../ui/mediapicker/MediaChooser.java | 2 +- .../messaging/ui/mediapicker/MediaPicker.java | 6 +++--- .../photoviewer/BuglePhotoBitmapLoader.java | 2 +- .../ui/photoviewer/BuglePhotoPageAdapter.java | 2 +- .../photoviewer/BuglePhotoViewController.java | 4 ++-- .../photoviewer/BuglePhotoViewFragment.java | 2 +- .../messaging/util/AccessibilityUtil.java | 4 ++-- .../android/messaging/util/AvatarUriUtil.java | 4 ++-- .../android/messaging/util/ImageUtils.java | 2 +- src/com/android/messaging/util/ImeUtil.java | 2 +- .../android/messaging/util/LongSparseSet.java | 2 +- src/com/android/messaging/util/OsUtil.java | 2 +- .../android/messaging/util/PhoneUtils.java | 2 +- .../messaging/util/SwitchCompatUtils.java | 8 ++++---- src/com/android/messaging/util/TextUtil.java | 2 +- .../messaging/util/TintDrawableWrapper.java | 4 ++-- src/com/android/messaging/util/UiUtils.java | 10 +++++----- src/com/android/messaging/util/UriUtil.java | 2 +- .../messaging/FakeContentProvider.java | 2 +- .../ui/CustomHeaderViewPagerTest.java | 2 +- .../ui/contact/ContactPickerFragmentTest.java | 2 +- .../ConversationFragmentTest.java | 2 +- .../ConversationListFragmentTest.java | 2 +- 161 files changed, 242 insertions(+), 242 deletions(-) diff --git a/Android.mk b/Android.mk index c9ada0d..b21b98f 100644 --- a/Android.mk +++ b/Android.mk @@ -23,21 +23,21 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true LOCAL_STATIC_ANDROID_LIBRARIES := \ - 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-palette \ - android-support-v7-recyclerview \ - 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.palette_palette \ + androidx.recyclerview_recyclerview \ + androidx.legacy_legacy-support-v13 \ colorpicker \ libchips \ libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-annotations \ + androidx.annotation_annotation \ android-common \ android-common-framesequence \ com.android.vcard \ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8b4ef03..48356a6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -520,7 +520,7 @@ - + diff --git a/proguard.flags b/proguard.flags index 759f2d4..44f6ccd 100644 --- a/proguard.flags +++ b/proguard.flags @@ -35,13 +35,13 @@ -keep public class * extends android.content.ContentProvider -keep public class * extends android.app.backup.BackupAgentHelper -keep public class * extends android.preference.Preference --keep public class * extends android.support.v4.app.Fragment +-keep public class * extends androidx.fragment.app.Fragment -keep public class com.android.vcard.* { *; } --keep class android.support.v4.* { *; } --keep class android.support.v4.*.* { *; } --keep class android.support.v7.* { *; } --keep class android.support.v7.*.* { *; } +-keep class androidx.core.* { *; } +-keep class androidx.core.*.* { *; } +-keep class androidx.appcompat.* { *; } +-keep class androidx.appcompat.*.* { *; } # Keep rastermill classes that need to be accessed from native code (JNI) -keep class android.support.rastermill.** { *; } diff --git a/res/layout/contact_picker_fragment.xml b/res/layout/contact_picker_fragment.xml index c65f140..78350d7 100644 --- a/res/layout/contact_picker_fragment.xml +++ b/res/layout/contact_picker_fragment.xml @@ -21,7 +21,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - - diff --git a/res/layout/people_options_item_view.xml b/res/layout/people_options_item_view.xml index fbb9592..8821eec 100644 --- a/res/layout/people_options_item_view.xml +++ b/res/layout/people_options_item_view.xml @@ -53,7 +53,7 @@ - - { diff --git a/src/com/android/messaging/mmslib/util/PduCache.java b/src/com/android/messaging/mmslib/util/PduCache.java index 9a400c0..939e4bd 100644 --- a/src/com/android/messaging/mmslib/util/PduCache.java +++ b/src/com/android/messaging/mmslib/util/PduCache.java @@ -21,7 +21,7 @@ import android.content.ContentUris; import android.content.UriMatcher; import android.net.Uri; import android.provider.Telephony.Mms; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.util.Log; import android.util.SparseArray; diff --git a/src/com/android/messaging/receiver/SmsReceiver.java b/src/com/android/messaging/receiver/SmsReceiver.java index db9b4bb..859beff 100644 --- a/src/com/android/messaging/receiver/SmsReceiver.java +++ b/src/com/android/messaging/receiver/SmsReceiver.java @@ -27,10 +27,10 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.provider.Telephony; import android.provider.Telephony.Sms; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.app.NotificationCompat.Style; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.Builder; +import androidx.core.app.NotificationCompat.Style; +import androidx.core.app.NotificationManagerCompat; import java.util.ArrayList; import java.util.regex.Pattern; diff --git a/src/com/android/messaging/sms/BugleApnSettingsLoader.java b/src/com/android/messaging/sms/BugleApnSettingsLoader.java index 43c95ac..36820ff 100644 --- a/src/com/android/messaging/sms/BugleApnSettingsLoader.java +++ b/src/com/android/messaging/sms/BugleApnSettingsLoader.java @@ -23,8 +23,8 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.net.Uri; import android.provider.Telephony; -import android.support.v7.mms.ApnSettingsLoader; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.ApnSettingsLoader; +import androidx.appcompat.mms.MmsManager; import android.text.TextUtils; import android.util.SparseArray; diff --git a/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java b/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java index ac6c7e4..51f17cb 100644 --- a/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java +++ b/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java @@ -21,7 +21,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.Bundle; -import android.support.v7.mms.CarrierConfigValuesLoader; +import androidx.appcompat.mms.CarrierConfigValuesLoader; import android.util.SparseArray; import com.android.messaging.R; diff --git a/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java b/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java index a8dc5c4..2b1dcd6 100644 --- a/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java +++ b/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java @@ -17,7 +17,7 @@ package com.android.messaging.sms; import android.content.Context; -import android.support.v7.mms.UserAgentInfoLoader; +import androidx.appcompat.mms.UserAgentInfoLoader; import android.telephony.TelephonyManager; import android.text.TextUtils; diff --git a/src/com/android/messaging/sms/MmsConfig.java b/src/com/android/messaging/sms/MmsConfig.java index f13d785..5649be4 100755 --- a/src/com/android/messaging/sms/MmsConfig.java +++ b/src/com/android/messaging/sms/MmsConfig.java @@ -17,7 +17,7 @@ package com.android.messaging.sms; import android.os.Bundle; -import android.support.v7.mms.CarrierConfigValuesLoader; +import androidx.appcompat.mms.CarrierConfigValuesLoader; import android.telephony.SubscriptionInfo; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/sms/MmsSender.java b/src/com/android/messaging/sms/MmsSender.java index 6dfa81a..b881a7f 100644 --- a/src/com/android/messaging/sms/MmsSender.java +++ b/src/com/android/messaging/sms/MmsSender.java @@ -22,7 +22,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.MmsManager; import android.telephony.SmsManager; import com.android.messaging.datamodel.MmsFileProvider; diff --git a/src/com/android/messaging/sms/SmsStorageStatusManager.java b/src/com/android/messaging/sms/SmsStorageStatusManager.java index ff7b79d..4f03195 100644 --- a/src/com/android/messaging/sms/SmsStorageStatusManager.java +++ b/src/com/android/messaging/sms/SmsStorageStatusManager.java @@ -19,8 +19,8 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.content.res.Resources; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import com.android.messaging.Factory; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/AsyncImageView.java b/src/com/android/messaging/ui/AsyncImageView.java index 9aaf0b1..e37966a 100644 --- a/src/com/android/messaging/ui/AsyncImageView.java +++ b/src/com/android/messaging/ui/AsyncImageView.java @@ -24,7 +24,7 @@ import android.graphics.Path; import android.graphics.RectF; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.support.rastermill.FrameSequenceDrawable; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/AttachmentPreviewFactory.java b/src/com/android/messaging/ui/AttachmentPreviewFactory.java index 7f1fce8..e801fe0 100644 --- a/src/com/android/messaging/ui/AttachmentPreviewFactory.java +++ b/src/com/android/messaging/ui/AttachmentPreviewFactory.java @@ -19,7 +19,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/messaging/ui/BlockedParticipantListItemView.java b/src/com/android/messaging/ui/BlockedParticipantListItemView.java index 2ccdebf..9654e70 100644 --- a/src/com/android/messaging/ui/BlockedParticipantListItemView.java +++ b/src/com/android/messaging/ui/BlockedParticipantListItemView.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/src/com/android/messaging/ui/BlockedParticipantsFragment.java b/src/com/android/messaging/ui/BlockedParticipantsFragment.java index 3ab54ab..14ec9d8 100644 --- a/src/com/android/messaging/ui/BlockedParticipantsFragment.java +++ b/src/com/android/messaging/ui/BlockedParticipantsFragment.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.widget.CursorAdapter; +import androidx.cursoradapter.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/BugleActionBarActivity.java b/src/com/android/messaging/ui/BugleActionBarActivity.java index 5d9c63a..42d40fe 100644 --- a/src/com/android/messaging/ui/BugleActionBarActivity.java +++ b/src/com/android/messaging/ui/BugleActionBarActivity.java @@ -18,8 +18,8 @@ package com.android.messaging.ui; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.ActionMode; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/CursorRecyclerAdapter.java b/src/com/android/messaging/ui/CursorRecyclerAdapter.java index f1a7b7d..750223a 100644 --- a/src/com/android/messaging/ui/CursorRecyclerAdapter.java +++ b/src/com/android/messaging/ui/CursorRecyclerAdapter.java @@ -21,7 +21,7 @@ import android.database.ContentObserver; import android.database.Cursor; import android.database.DataSetObserver; import android.os.Handler; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.ViewGroup; import android.widget.FilterQueryProvider; @@ -158,7 +158,7 @@ public abstract class CursorRecyclerAdapter } /** - * @see android.support.v7.widget.RecyclerView.Adapter#getItem(int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#getItem(int) */ public Object getItem(final int position) { if (mDataValid && mCursor != null) { @@ -170,7 +170,7 @@ public abstract class CursorRecyclerAdapter } /** - * @see android.support.v7.widget.RecyclerView.Adapter#getItemId(int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemId(int) */ @Override public long getItemId(final int position) { @@ -210,7 +210,7 @@ public abstract class CursorRecyclerAdapter public abstract void bindViewHolder(VH holder, Context context, Cursor cursor); /** - * @see android.support.v7.widget.RecyclerView.Adapter#createViewHolder(Context, ViewGroup, int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#createViewHolder(Context, ViewGroup, int) */ public abstract VH createViewHolder(Context context, ViewGroup parent, int viewType); diff --git a/src/com/android/messaging/ui/CustomHeaderViewPager.java b/src/com/android/messaging/ui/CustomHeaderViewPager.java index 2e8df42..31505c8 100644 --- a/src/com/android/messaging/ui/CustomHeaderViewPager.java +++ b/src/com/android/messaging/ui/CustomHeaderViewPager.java @@ -16,9 +16,9 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.util.TypedValue; import android.view.LayoutInflater; diff --git a/src/com/android/messaging/ui/FixedViewPagerAdapter.java b/src/com/android/messaging/ui/FixedViewPagerAdapter.java index bd73b71..30e11e3 100644 --- a/src/com/android/messaging/ui/FixedViewPagerAdapter.java +++ b/src/com/android/messaging/ui/FixedViewPagerAdapter.java @@ -17,7 +17,7 @@ package com.android.messaging.ui; import android.os.Bundle; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/PagingAwareViewPager.java b/src/com/android/messaging/ui/PagingAwareViewPager.java index cc7b2cd..34562dc 100644 --- a/src/com/android/messaging/ui/PagingAwareViewPager.java +++ b/src/com/android/messaging/ui/PagingAwareViewPager.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/PersonItemView.java b/src/com/android/messaging/ui/PersonItemView.java index afd1a99..2db1219 100644 --- a/src/com/android/messaging/ui/PersonItemView.java +++ b/src/com/android/messaging/ui/PersonItemView.java @@ -17,8 +17,8 @@ package com.android.messaging.ui; import android.content.Context; import android.content.Intent; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/src/com/android/messaging/ui/SnackBar.java b/src/com/android/messaging/ui/SnackBar.java index a278040..2f85461 100644 --- a/src/com/android/messaging/ui/SnackBar.java +++ b/src/com/android/messaging/ui/SnackBar.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/messaging/ui/TestActivity.java b/src/com/android/messaging/ui/TestActivity.java index 1693660..fc3c706 100644 --- a/src/com/android/messaging/ui/TestActivity.java +++ b/src/com/android/messaging/ui/TestActivity.java @@ -18,7 +18,7 @@ package com.android.messaging.ui; import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; diff --git a/src/com/android/messaging/ui/UIIntentsImpl.java b/src/com/android/messaging/ui/UIIntentsImpl.java index b7db719..fb624ad 100644 --- a/src/com/android/messaging/ui/UIIntentsImpl.java +++ b/src/com/android/messaging/ui/UIIntentsImpl.java @@ -34,9 +34,9 @@ import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents; import android.provider.MediaStore; import android.provider.Telephony; -import android.support.annotation.Nullable; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import com.android.ex.photo.Intents.PhotoViewIntentBuilder; diff --git a/src/com/android/messaging/ui/ViewPagerTabs.java b/src/com/android/messaging/ui/ViewPagerTabs.java index f31a071..bb4aaaf 100644 --- a/src/com/android/messaging/ui/ViewPagerTabs.java +++ b/src/com/android/messaging/ui/ViewPagerTabs.java @@ -20,8 +20,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.Outline; import android.graphics.drawable.ColorDrawable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; diff --git a/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java b/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java index 5fc2a19..e14d16e 100644 --- a/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java +++ b/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java @@ -80,7 +80,7 @@ public class PopupTransitionAnimation extends Animation { mPopupRect = new Rect(); mActionBarRect = new Rect(); mActionBarView = viewToAnimate.getRootView().findViewById( - android.support.v7.appcompat.R.id.action_bar); + androidx.appcompat.R.id.action_bar); mRectEvaluator = RectEvaluatorCompat.create(); setDuration(UiUtils.MEDIAPICKER_TRANSITION_DURATION); setInterpolator(UiUtils.DEFAULT_INTERPOLATOR); diff --git a/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java b/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java index 6abfdf9..7dc41fb 100644 --- a/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java +++ b/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java @@ -25,7 +25,7 @@ import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroupOverlay; diff --git a/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java b/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java index b7cb7ae..ae4b2eb 100644 --- a/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java @@ -29,7 +29,7 @@ import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.provider.Telephony; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java b/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java index 28dfc2a..8b4644e 100644 --- a/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java @@ -35,7 +35,7 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.provider.Telephony; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java index 906009f..d7abe85 100644 --- a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java @@ -30,7 +30,7 @@ import android.preference.PreferenceScreen; import android.preference.RingtonePreference; import android.preference.TwoStatePreference; import android.provider.Settings; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java index e02823f..623bc91 100644 --- a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java @@ -28,7 +28,7 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java b/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java index 0c9c018..42ef606 100644 --- a/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java +++ b/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java @@ -18,8 +18,8 @@ package com.android.messaging.ui.appsettings; import android.content.Context; import android.preference.EditTextPreference; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.InputType; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/appsettings/SettingsActivity.java b/src/com/android/messaging/ui/appsettings/SettingsActivity.java index 75266d8..e8c05ec 100644 --- a/src/com/android/messaging/ui/appsettings/SettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/SettingsActivity.java @@ -19,7 +19,7 @@ package com.android.messaging.ui.appsettings; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java b/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java index b39dc3e..75ea56d 100644 --- a/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java +++ b/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java @@ -20,7 +20,7 @@ import android.content.Context; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java index 051ebeb..0caf6b7 100644 --- a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java +++ b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java @@ -18,8 +18,8 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.graphics.drawable.StateListDrawable; import android.net.Uri; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/contact/ContactPickerFragment.java b/src/com/android/messaging/ui/contact/ContactPickerFragment.java index d803087..e201074 100644 --- a/src/com/android/messaging/ui/contact/ContactPickerFragment.java +++ b/src/com/android/messaging/ui/contact/ContactPickerFragment.java @@ -21,9 +21,9 @@ import android.app.Fragment; import android.database.Cursor; import android.graphics.Rect; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.Toolbar.OnMenuItemClickListener; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java index 1d91241..e330447 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.database.Cursor; import android.database.MergeCursor; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.text.TextUtils; import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java index c7c2731..dc13f22 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java @@ -19,7 +19,7 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Rect; import android.os.AsyncTask; -import android.support.v7.appcompat.R; +import androidx.appcompat.R; import android.text.Editable; import android.text.TextPaint; import android.text.TextWatcher; diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index 17f8f74..5db1292 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.Editable; import android.text.Html; import android.text.InputFilter; diff --git a/src/com/android/messaging/ui/conversation/ConversationActivity.java b/src/com/android/messaging/ui/conversation/ConversationActivity.java index 66310ea..be94460 100644 --- a/src/com/android/messaging/ui/conversation/ConversationActivity.java +++ b/src/com/android/messaging/ui/conversation/ConversationActivity.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.TextUtils; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversation/ConversationFastScroller.java b/src/com/android/messaging/ui/conversation/ConversationFastScroller.java index b15f05a..f17f11e 100644 --- a/src/com/android/messaging/ui/conversation/ConversationFastScroller.java +++ b/src/com/android/messaging/ui/conversation/ConversationFastScroller.java @@ -23,10 +23,10 @@ import android.content.res.Resources; import android.graphics.Rect; import android.graphics.drawable.StateListDrawable; import android.os.Handler; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.AdapterDataObserver; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.util.StateSet; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/conversation/ConversationFragment.java b/src/com/android/messaging/ui/conversation/ConversationFragment.java index a6a191a..fbc6730 100644 --- a/src/com/android/messaging/ui/conversation/ConversationFragment.java +++ b/src/com/android/messaging/ui/conversation/ConversationFragment.java @@ -43,14 +43,14 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Parcelable; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.ActionMode; import android.view.Display; diff --git a/src/com/android/messaging/ui/conversation/ConversationInput.java b/src/com/android/messaging/ui/conversation/ConversationInput.java index bf60aa8..cf98dbe 100644 --- a/src/com/android/messaging/ui/conversation/ConversationInput.java +++ b/src/com/android/messaging/ui/conversation/ConversationInput.java @@ -16,7 +16,7 @@ package com.android.messaging.ui.conversation; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; /** * The base class for a method of user input, e.g. media picker. diff --git a/src/com/android/messaging/ui/conversation/ConversationInputManager.java b/src/com/android/messaging/ui/conversation/ConversationInputManager.java index e10abe7..3d42d78 100644 --- a/src/com/android/messaging/ui/conversation/ConversationInputManager.java +++ b/src/com/android/messaging/ui/conversation/ConversationInputManager.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversation; import android.app.FragmentManager; import android.content.Context; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.widget.EditText; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java b/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java index 2748fff..fb04bb4 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversation; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java index 0bfb960..20c986d 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Spanned; import android.text.TextUtils; import android.text.format.DateUtils; diff --git a/src/com/android/messaging/ui/conversation/ConversationSimSelector.java b/src/com/android/messaging/ui/conversation/ConversationSimSelector.java index fc43a46..94c7e76 100644 --- a/src/com/android/messaging/ui/conversation/ConversationSimSelector.java +++ b/src/com/android/messaging/ui/conversation/ConversationSimSelector.java @@ -16,7 +16,7 @@ package com.android.messaging.ui.conversation; import android.content.Context; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java index dbbbb15..f3de0ab 100644 --- a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java index 366c7d3..342c970 100644 --- a/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversationlist; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java index f8abe81..636b0f5 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversationlist; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java b/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java index 629c4ae..fc687eb 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversationlist; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -43,7 +43,7 @@ public class ConversationListAdapter /** * @see com.android.messaging.ui.CursorRecyclerAdapter#bindViewHolder( - * android.support.v7.widget.RecyclerView.ViewHolder, android.content.Context, + * androidx.recyclerview.widget.RecyclerView.ViewHolder, android.content.Context, * android.database.Cursor) */ @Override diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java index 2f868d4..269efcb 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java @@ -23,10 +23,10 @@ import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.os.Parcelable; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewGroupCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.view.ViewCompat; +import androidx.core.view.ViewGroupCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java index 6b02eb3..b22ccfc 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java @@ -22,8 +22,8 @@ import android.graphics.Color; import android.graphics.Rect; import android.graphics.Typeface; import android.net.Uri; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java b/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java index 4988259..e5859a6 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java @@ -21,9 +21,9 @@ import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.content.Context; import android.content.res.Resources; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.OnItemTouchListener; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; diff --git a/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java b/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java index bfeec51..64d1436 100644 --- a/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java +++ b/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java @@ -15,7 +15,7 @@ */ package com.android.messaging.ui.conversationlist; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.text.TextUtils; import android.view.ActionMode; import android.view.ActionMode.Callback; diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java b/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java index e894145..6d465ee 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java b/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java index bc549ea..beafb53 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java @@ -24,8 +24,8 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.database.Cursor; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java b/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java index 42ecfeb..5b6f3b0 100644 --- a/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java +++ b/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversationsettings; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/messaging/ui/mediapicker/CameraManager.java b/src/com/android/messaging/ui/mediapicker/CameraManager.java index 166ebd7..835fab3 100644 --- a/src/com/android/messaging/ui/mediapicker/CameraManager.java +++ b/src/com/android/messaging/ui/mediapicker/CameraManager.java @@ -28,7 +28,7 @@ import android.media.MediaRecorder; import android.net.Uri; import android.os.AsyncTask; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java index a5a7dad..2265dd5 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java @@ -20,7 +20,7 @@ import android.graphics.Rect; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.util.AttributeSet; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java index 9422386..1b8c2dc 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java @@ -21,7 +21,7 @@ import android.content.pm.PackageManager; import android.database.Cursor; import android.database.MatrixCursor; import android.database.MergeCursor; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/MediaChooser.java b/src/com/android/messaging/ui/mediapicker/MediaChooser.java index 9ac0d1b..ef4067c 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/MediaChooser.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.mediapicker; import android.app.FragmentManager; import android.content.Context; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/MediaPicker.java b/src/com/android/messaging/ui/mediapicker/MediaPicker.java index f441d09..8e5198b 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaPicker.java +++ b/src/com/android/messaging/ui/mediapicker/MediaPicker.java @@ -23,9 +23,9 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java index d139a38..9911456 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java @@ -19,7 +19,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; import android.support.rastermill.FrameSequenceDrawable; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; import com.android.ex.photo.PhotoViewController; import com.android.ex.photo.loaders.PhotoBitmapLoaderInterface; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java index 52498c7..c19070b 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.photoviewer; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.FragmentManager; import com.android.ex.photo.adapters.PhotoPagerAdapter; import com.android.ex.photo.fragments.PhotoViewFragment; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java index eb39886..0bb8f11 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java @@ -23,8 +23,8 @@ import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.Loader; +import androidx.fragment.app.FragmentManager; +import androidx.loader.content.Loader; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java index 698c510..a6293dc 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.photoviewer; import android.content.Intent; import android.graphics.drawable.Drawable; import android.support.rastermill.FrameSequenceDrawable; -import android.support.v4.content.Loader; +import androidx.loader.content.Loader; import com.android.ex.photo.PhotoViewCallbacks; import com.android.ex.photo.fragments.PhotoViewFragment; diff --git a/src/com/android/messaging/util/AccessibilityUtil.java b/src/com/android/messaging/util/AccessibilityUtil.java index f6c64a9..788f482 100644 --- a/src/com/android/messaging/util/AccessibilityUtil.java +++ b/src/com/android/messaging/util/AccessibilityUtil.java @@ -17,8 +17,8 @@ package com.android.messaging.util; import android.content.Context; import android.content.res.Resources; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; import android.text.TextUtils; import android.view.View; import android.view.accessibility.AccessibilityEvent; diff --git a/src/com/android/messaging/util/AvatarUriUtil.java b/src/com/android/messaging/util/AvatarUriUtil.java index df7d085..b6c65e3 100644 --- a/src/com/android/messaging/util/AvatarUriUtil.java +++ b/src/com/android/messaging/util/AvatarUriUtil.java @@ -18,8 +18,8 @@ package com.android.messaging.util; import android.graphics.Color; import android.net.Uri; import android.net.Uri.Builder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.android.messaging.datamodel.data.ParticipantData; diff --git a/src/com/android/messaging/util/ImageUtils.java b/src/com/android/messaging/util/ImageUtils.java index 05d3678..5e20e7b 100644 --- a/src/com/android/messaging/util/ImageUtils.java +++ b/src/com/android/messaging/util/ImageUtils.java @@ -32,7 +32,7 @@ import android.graphics.Shader.TileMode; import android.graphics.drawable.Drawable; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; diff --git a/src/com/android/messaging/util/ImeUtil.java b/src/com/android/messaging/util/ImeUtil.java index ab0df13..3f033d0 100644 --- a/src/com/android/messaging/util/ImeUtil.java +++ b/src/com/android/messaging/util/ImeUtil.java @@ -16,7 +16,7 @@ package com.android.messaging.util; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/src/com/android/messaging/util/LongSparseSet.java b/src/com/android/messaging/util/LongSparseSet.java index 8e2cfca..bb3843e 100644 --- a/src/com/android/messaging/util/LongSparseSet.java +++ b/src/com/android/messaging/util/LongSparseSet.java @@ -16,7 +16,7 @@ package com.android.messaging.util; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; /** * A space saving set for long values using v4 compat LongSparseArray diff --git a/src/com/android/messaging/util/OsUtil.java b/src/com/android/messaging/util/OsUtil.java index 4890d08..1d9742a 100644 --- a/src/com/android/messaging/util/OsUtil.java +++ b/src/com/android/messaging/util/OsUtil.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import android.support.v4.os.BuildCompat; +import androidx.core.os.BuildCompat; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java index 726f083..671c65e 100644 --- a/src/com/android/messaging/util/PhoneUtils.java +++ b/src/com/android/messaging/util/PhoneUtils.java @@ -26,7 +26,7 @@ import android.database.Cursor; import android.net.ConnectivityManager; import android.provider.Settings; import android.provider.Telephony; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; import android.telephony.SubscriptionInfo; diff --git a/src/com/android/messaging/util/SwitchCompatUtils.java b/src/com/android/messaging/util/SwitchCompatUtils.java index b5d1ed5..8cfe2bc 100644 --- a/src/com/android/messaging/util/SwitchCompatUtils.java +++ b/src/com/android/messaging/util/SwitchCompatUtils.java @@ -21,12 +21,12 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.graphics.drawable.DrawableWrapper; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.widget.SwitchCompat; import android.util.TypedValue; /* Most methods in this file are copied from - * v7/appcompat/src/android/support/v7/internal/widget/TintManager.java. It would be better if + * v7/appcompat/src/androidx.appcompat.internal/widget/TintManager.java. It would be better if * we could have just extended the TintManager but this is a final class that we do not have * access to. */ @@ -78,7 +78,7 @@ public class SwitchCompatUtils { // Default enabled state states[i] = new int[0]; colors[i] = getThemeAttrColor(context, typedValue, - android.support.v7.appcompat.R.attr.colorSwitchThumbNormal); + androidx.appcompat.R.attr.colorSwitchThumbNormal); i++; return new ColorStateList(states, colors); } diff --git a/src/com/android/messaging/util/TextUtil.java b/src/com/android/messaging/util/TextUtil.java index b240396..f715551 100644 --- a/src/com/android/messaging/util/TextUtil.java +++ b/src/com/android/messaging/util/TextUtil.java @@ -15,7 +15,7 @@ */ package com.android.messaging.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class TextUtil { /** diff --git a/src/com/android/messaging/util/TintDrawableWrapper.java b/src/com/android/messaging/util/TintDrawableWrapper.java index e6ea4bd..06ee7d4 100644 --- a/src/com/android/messaging/util/TintDrawableWrapper.java +++ b/src/com/android/messaging/util/TintDrawableWrapper.java @@ -20,10 +20,10 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.graphics.drawable.DrawableWrapper; +import androidx.appcompat.graphics.drawable.DrawableWrapper; /* - * This is directly copied from v7/appcompat/src/android/support/v7/internal/widget/TintManager.java + * This is directly copied from v7/appcompat/src/androidx.appcompat.internal/widget/TintManager.java */ /** diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java index e446c73..6e0c16e 100644 --- a/src/com/android/messaging/util/UiUtils.java +++ b/src/com/android/messaging/util/UiUtils.java @@ -24,10 +24,10 @@ import android.content.res.Configuration; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.text.Spanned; import android.text.TextPaint; @@ -376,7 +376,7 @@ public class UiUtils { activity.getResources().getDimensionPixelSize(R.dimen.action_bar_elevation) : 0); final View actionBarView = activity.getWindow().getDecorView().findViewById( - android.support.v7.appcompat.R.id.decor_content_parent); + androidx.appcompat.R.id.decor_content_parent); if (actionBarView != null) { // AppCompatActionBar has one drawable Field, which is the shadow for the action bar // set the alpha on that drawable manually diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java index 7cd6062..0e931c4 100644 --- a/src/com/android/messaging/util/UriUtil.java +++ b/src/com/android/messaging/util/UriUtil.java @@ -22,7 +22,7 @@ import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/tests/src/com/android/messaging/FakeContentProvider.java b/tests/src/com/android/messaging/FakeContentProvider.java index 53c29ba..eb90cbb 100644 --- a/tests/src/com/android/messaging/FakeContentProvider.java +++ b/tests/src/com/android/messaging/FakeContentProvider.java @@ -25,7 +25,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.text.TextUtils; import com.android.messaging.datamodel.FakeCursor; diff --git a/tests/src/com/android/messaging/ui/CustomHeaderViewPagerTest.java b/tests/src/com/android/messaging/ui/CustomHeaderViewPagerTest.java index 011cb82..373fb41 100644 --- a/tests/src/com/android/messaging/ui/CustomHeaderViewPagerTest.java +++ b/tests/src/com/android/messaging/ui/CustomHeaderViewPagerTest.java @@ -15,7 +15,7 @@ */ package com.android.messaging.ui; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.SimpleCursorAdapter; diff --git a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java index 5b1503b..ebff876 100644 --- a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java +++ b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.database.Cursor; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.test.suitebuilder.annotation.LargeTest; import android.view.View; import android.widget.ListView; diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java index c92fbf6..853c330 100644 --- a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java @@ -19,7 +19,7 @@ package com.android.messaging.ui.conversation; import android.app.Activity; import android.app.Fragment; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.test.suitebuilder.annotation.LargeTest; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java b/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java index f9cc9e1..6add677 100644 --- a/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java +++ b/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversationlist; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.test.suitebuilder.annotation.LargeTest; import android.view.View; import android.widget.ImageView; From 7d0e40963a77205fcbc0978a52ffc28f0f68ba2d Mon Sep 17 00:00:00 2001 From: calvinpan Date: Thu, 10 Jan 2019 20:25:47 +0800 Subject: [PATCH 4/5] Migrate to TelephonyProvider new URI when query the current sim APN Since MCC, MNC and MVNO is deprecated in the TelephonyProvider and query based on SIM_APN_URI will return all matching APNs from current subscription carrier, so migrate to the new URI. Bug: 115709816 Test: Build pass. Change-Id: I260f2da2677564f37ef6a7711d45040a61215ddc --- src/com/android/messaging/sms/MmsUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index 913e9a6..9c4c2d5 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -1535,7 +1535,7 @@ public class MmsUtils { cursor = SqliteWrapper.query( context, resolver, - Telephony.Carriers.CONTENT_URI, + Telephony.Carriers.SIM_APN_URI, TEST_CARRIERS_PROJECTION, null/*selection*/, null/*selectionArgs*/, From 63cffd0246a37c6256684252e9a36166c74f21fb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 11 Apr 2019 14:34:50 -0700 Subject: [PATCH 5/5] Update messaging for guava 27.1 CharMatcher.ASCII has been replaced with CharMatcher.ascii(). Bug: 130306229 Test: m checkbuild Change-Id: I21473e2aa5e432b135fac7f1ecf0a85f52f3951e --- src/com/android/messaging/util/EmailAddress.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/messaging/util/EmailAddress.java b/src/com/android/messaging/util/EmailAddress.java index 0c0dab9..c59170e 100644 --- a/src/com/android/messaging/util/EmailAddress.java +++ b/src/com/android/messaging/util/EmailAddress.java @@ -160,7 +160,7 @@ public final class EmailAddress { // Host must not have any disallowed characters; allowI18n dictates whether // host must be ASCII. if (!EMAIL_ALLOWED_CHARS.matchesAllOf(host) - || (!allowI18n && !CharMatcher.ASCII.matchesAllOf(host))) { + || (!allowI18n && !CharMatcher.ascii().matchesAllOf(host))) { return false; } @@ -182,7 +182,7 @@ public final class EmailAddress { // User must not have any disallowed characters; allow I18n dictates whether // user must be ASCII. if (!EMAIL_ALLOWED_CHARS.matchesAllOf(user) - || (!allowI18n && !CharMatcher.ASCII.matchesAllOf(user))) { + || (!allowI18n && !CharMatcher.ascii().matchesAllOf(user))) { return false; } }