Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
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">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
@@ -58,7 +58,7 @@
</com.android.messaging.ui.MaxHeightScrollView>
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<FrameLayout
android:layout_width="match_parent"
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 028e66b..0bf42f5 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -34,7 +34,7 @@
android:layout_height="match_parent"
android:layout_weight="1" >
<!-- Message list -->
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index bf5d401..7fa2a9a 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/custom_header_view_pager.xml b/res/layout/custom_header_view_pager.xml
index 9552cd6..96f8fa8 100644
--- a/res/layout/custom_header_view_pager.xml
+++ b/res/layout/custom_header_view_pager.xml
@@ -30,7 +30,7 @@
android:layout_height="0dp"
android:layout_weight="1">
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
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 @@
</LinearLayout>
- <android.support.v7.widget.SwitchCompat
+ <androidx.appcompat.widget.SwitchCompat
android:id="@+id/switch_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/share_intent_conversation_list_view.xml b/res/layout/share_intent_conversation_list_view.xml
index 3da3c6b..1dec1fe 100644
--- a/res/layout/share_intent_conversation_list_view.xml
+++ b/res/layout/share_intent_conversation_list_view.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"