Raise deployment target and migrate to AndroidX

2025-12-03 04:42:19 +00:00 · 2020-08-19 10:06:26 +10:00
parent 6e2cbb23cc
commit 96736a8095
763 changed files with 1733 additions and 1848 deletions
--- a/res/layout/activity_contact_name_edit.xml
+++ b/res/layout/activity_contact_name_edit.xml
@@ -7,7 +7,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
--- a/res/layout/activity_contact_share_edit.xml
+++ b/res/layout/activity_contact_share_edit.xml
@@ -4,14 +4,14 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/contact_share_edit_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:paddingBottom="80dp"
        android:clipToPadding="false"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/contact_share_edit_send"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -27,7 +27,7 @@
            android:layout_height="1px"
            android:background="@color/separator" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
--- a/res/layout/activity_create_private_chat.xml
+++ b/res/layout/activity_create_private_chat.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -129,7 +129,7 @@
            android:layout_height="1px"
            android:background="@color/separator" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent"/>
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -8,7 +8,7 @@
    android:background="@drawable/default_session_background"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@@ -58,7 +58,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <org.thoughtcrime.securesms.loki.views.SeedReminderView
        android:id="@+id/seedReminderView"
@@ -69,7 +69,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/activity_join_public_chat.xml
+++ b/res/layout/activity_join_public_chat.xml
@@ -5,18 +5,18 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewPager"
        android:layout_width="match_parent"
        android:layout_height="match_parent" >

-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
            style="@style/Session.DarkTabLayout"
            android:id="@+id/tabLayout"
            android:layout_width="match_parent"
            android:layout_height="@dimen/tab_bar_height" />

-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>

    <RelativeLayout
        android:id="@+id/loader"
--- a/res/layout/activity_link_device.xml
+++ b/res/layout/activity_link_device.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_linked_devices.xml
+++ b/res/layout/activity_linked_devices.xml
@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/recyclerView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
--- a/res/layout/activity_qr_code.xml
+++ b/res/layout/activity_qr_code.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -11,7 +11,7 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -17,7 +17,7 @@
            android:orientation="vertical"
            android:gravity="center_horizontal">

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
@@ -68,7 +68,7 @@

                </LinearLayout>

-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>

            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                android:id="@+id/profilePictureView"
--- a/res/layout/activity_shared_contact_details.xml
+++ b/res/layout/activity_shared_contact_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -7,11 +7,11 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="?attr/shared_contact_details_header_background">
@@ -138,7 +138,7 @@

            </LinearLayout>

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
@@ -146,14 +146,14 @@
                android:background="@color/transparent"
                app:layout_collapseMode="pin" />

-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/contact_details_fields"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/captcha_activity.xml
+++ b/res/layout/captcha_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@@ -34,4 +34,4 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/registration_captcha_title" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -18,7 +18,7 @@
                      android:visibility="visible"
                      android:orientation="vertical">
                
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@@ -30,9 +30,9 @@
                          android:hint="@string/change_passphrase_activity__old_passphrase"
                          android:singleLine="true"/>

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@@ -43,9 +43,9 @@
                          android:hint="@string/change_passphrase_activity__new_passphrase"
                          android:singleLine="true"/>

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@@ -56,7 +56,7 @@
                          android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
                          android:singleLine="true" />

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

            <LinearLayout android:orientation="horizontal"
                          android:layout_width="fill_parent"
--- a/res/layout/contact_selection_list_fragment.xml
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -25,12 +25,12 @@
        android:layout_height="match_parent"
        android:orientation="vertical">
    
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
            android:id="@+id/swipeRefreshLayout"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/recyclerView"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -46,7 +46,7 @@
                android:text="@string/contact_selection_group_activity__finding_contacts"
                android:textSize="@dimen/large_font_size" />

-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

    </LinearLayout>

--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -7,7 +7,7 @@
    android:layout_height="match_parent"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@@ -74,7 +74,7 @@

        </LinearLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <org.thoughtcrime.securesms.components.InputAwareLayout
        android:id="@+id/layout_container"
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -5,7 +5,7 @@
             android:layout_width="fill_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="match_parent"
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -17,7 +17,7 @@
    android:clipChildren="false"
    android:clipToPadding="false">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/input_panel_sticker_suggestion"
        android:layout_width="match_parent"
        android:layout_height="90dp"
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -7,7 +7,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_alignParentTop="true"
            android:layout_width="match_parent"
@@ -50,7 +50,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <FrameLayout android:id="@+id/fragment_container"
                 android:layout_below="@id/toolbar"
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
        android:layout_width="fill_parent"
@@ -56,7 +56,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/list"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -79,4 +79,4 @@
            android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>


-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@@ -9,7 +9,7 @@
    android:background="@color/compose_view_background"
    android:visibility="gone"
    tools:visibility="visible"
-    tools:parentTag="android.support.constraint.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

    <TextView
        android:id="@+id/conversation_search_position"
--- a/res/layout/device_link_fragment.xml
+++ b/res/layout/device_link_fragment.xml
@@ -14,7 +14,7 @@
            android:layout_marginBottom="25dp"
            android:contentDescription="@string/device_link_fragment__link_device"/>

-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="25dp"
@@ -83,6 +83,6 @@
        </LinearLayout>


-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>

 </LinearLayout>
--- a/res/layout/emoji_grid_layout.xml
+++ b/res/layout/emoji_grid_layout.xml
@@ -4,7 +4,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/emoji"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/enter_backup_passphrase_dialog.xml
+++ b/res/layout/enter_backup_passphrase_dialog.xml
@@ -4,11 +4,11 @@
             android:layout_height="wrap_content"
             android:padding="16dp">

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/restore_passphrase_input"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -16,5 +16,5 @@
                android:imeOptions="actionDone"
                android:inputType="number" />

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </FrameLayout>
--- a/res/layout/experience_upgrade_activity.xml
+++ b/res/layout/experience_upgrade_activity.xml
@@ -6,7 +6,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
--- a/res/layout/experience_upgrade_link_previews_fragment.xml
+++ b/res/layout/experience_upgrade_link_previews_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@@ -83,7 +83,7 @@

    </LinearLayout>

-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
        android:id="@+id/experience_ok_button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -98,4 +98,4 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/experience_upgrade_preference_fragment.xml
+++ b/res/layout/experience_upgrade_preference_fragment.xml
@@ -50,7 +50,7 @@
                  android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
                  android:textColor="@android:color/white" />

-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                    android:id="@+id/preference"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
--- a/res/layout/experience_upgrade_typing_indicators_fragment.xml
+++ b/res/layout/experience_upgrade_typing_indicators_fragment.xml
@@ -83,7 +83,7 @@
            android:textIsSelectable="false"
            android:textSize="@dimen/onboarding_subtitle_size" />

-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
            android:id="@+id/experience_yes_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
            android:textColor="@color/core_blue"
            app:backgroundTint="@color/core_white" />

-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
            android:id="@+id/experience_no_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -12,7 +12,7 @@
        android:background="?attr/search_background"
        android:visibility="gone" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/search_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
--- a/res/layout/fragment_submit_log.xml
+++ b/res/layout/fragment_submit_log.xml
@@ -43,7 +43,7 @@
        android:layout_height="0dp"
        android:layout_weight="1">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/log_preview"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
--- a/res/layout/giphy_activity.xml
+++ b/res/layout/giphy_activity.xml
@@ -5,13 +5,13 @@
                android:layout_width="match_parent"
                android:orientation="vertical">

-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_above="@+id/giphy_logo"
            android:orientation="vertical">

-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="?attr/colorPrimary">
@@ -24,7 +24,7 @@
                    android:theme="?attr/actionBarStyle"
                    app:layout_scrollFlags="scroll|enterAlways"/>

-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                    android:id="@+id/tab_layout"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@@ -33,15 +33,15 @@
                    app:tabIndicatorColor="@color/accent"
                    android:scrollbars="horizontal"/>

-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>

-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
                android:id="@+id/giphy_pager"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>

    <ImageView android:id="@+id/giphy_logo"
               android:src="@drawable/poweredby_giphy"
--- a/res/layout/giphy_fragment.xml
+++ b/res/layout/giphy_fragment.xml
@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/giphy_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/image_editor_hud.xml
+++ b/res/layout/image_editor_hud.xml
@@ -9,7 +9,7 @@
    tools:parentTag="android.widget.LinearLayout"
    tools:background="@color/core_grey_60">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="1"
@@ -105,7 +105,7 @@
            app:pickerBorderWidth="3dp"
            app:pickerColors="@array/scribble_colors" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/scribble_color_palette"
            android:layout_width="wrap_content"
            android:layout_height="0dp"
@@ -148,6 +148,6 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent" />

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/item_editable_contact.xml
+++ b/res/layout/item_editable_contact.xml
@@ -39,7 +39,7 @@
        android:layout_height="1dp"
        android:src="@color/grey_400"/>
    
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/editable_contact_fields"
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/linkpreview_container"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -99,6 +99,6 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/media_keyboard.xml
+++ b/res/layout/media_keyboard.xml
@@ -6,7 +6,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="?emoji_drawer_background">
@@ -66,7 +66,7 @@
            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
            app:layout_constraintTop_toTopOf="@+id/media_keyboard_tabs" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_keyboard_tabs"
            android:layout_width="0dp"
            android:layout_height="40dp"
@@ -104,6 +104,6 @@
            app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"
            tools:visibility="visible"/>

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_height="match_parent"
        android:layout_width="match_parent"
@@ -7,11 +7,11 @@
        xmlns:tools="http://schemas.android.com/tools"
        xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?android:attr/actionBarSize"
@@ -29,7 +29,7 @@
                app:tabIndicatorColor="@color/textsecure_primary"
                app:tabSelectedTextColor="@color/textsecure_primary"/>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

    <org.thoughtcrime.securesms.components.ControllableViewPager
            android:id="@+id/pager"
@@ -37,4 +37,4 @@
            android:layout_height="match_parent"
            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/media_overview_documents_fragment.xml
@@ -5,7 +5,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recycler_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/media_overview_gallery_fragment.xml
@@ -5,7 +5,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_grid"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@@ -47,7 +47,7 @@

        </org.thoughtcrime.securesms.components.MaxHeightScrollView>

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_preview_album_rail"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@@ -6,7 +6,7 @@
    android:orientation="vertical"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/mediapicker_toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@@ -14,7 +14,7 @@
        android:background="@color/action_bar_background"
        android:theme="?attr/actionBarStyle" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/mediapicker_folder_list"
        android:background="@drawable/default_session_background"
        android:layout_width="match_parent"
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@@ -6,7 +6,7 @@
    android:orientation="vertical"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/mediapicker_toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@@ -14,7 +14,7 @@
        android:background="@color/action_bar_background"
        android:theme="?attr/actionBarStyle" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/mediapicker_item_list"
        android:background="@drawable/default_session_background"
        android:layout_width="match_parent"
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -49,7 +49,7 @@
                android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
                android:background="@null"/>

-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/mediasend_media_rail"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -17,7 +17,7 @@
            android:layout_height="0dp"
            android:layout_weight="1">

-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@@ -135,7 +135,7 @@
                    app:layout_constraintTop_toBottomOf="@+id/name"
                    app:layout_constraintVertical_bias="1.0" />

-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>

        </ScrollView>

--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -22,7 +22,7 @@

    </FrameLayout>

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
@@ -34,7 +34,7 @@
            android:src="@drawable/ic_launcher_foreground"
            android:layout_gravity="center" />

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <LinearLayout
            android:layout_width="match_parent"
--- a/res/layout/recent_photo_view.xml
+++ b/res/layout/recent_photo_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
        android:id="@+id/photo_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:layout_width="match_parent"
@@ -9,13 +9,13 @@
        android:background="@color/transparent"
        xmlns:tools="http://schemas.android.com/tools">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/app_bar_layout"
            android:layout_width="match_parent"
            android:layout_height="300dp"
            android:background="@color/transparent">

-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
                android:id="@+id/collapsing_toolbar"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -42,7 +42,7 @@
                    android:layout_alignBottom="@+id/image"
                    android:background="@drawable/recipient_preference_scrim_bottom"/>

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                    android:id="@+id/toolbar"
                    android:layout_width="match_parent"
                    android:layout_height="?attr/actionBarSize"
@@ -51,13 +51,13 @@
                    android:layout_marginTop="24dp"
                    app:layout_collapseMode="pin" >

-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>

-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
            android:id="@+id/scroll_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@@ -94,6 +94,6 @@

        </LinearLayout>

-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/recipient_preference_photo_rail.xml
+++ b/res/layout/recipient_preference_photo_rail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/photo_list"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/recording_container"
@@ -101,4 +101,4 @@

    </FrameLayout>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -187,7 +187,7 @@

        </LinearLayout>

-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/verification_container"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@@ -239,7 +239,7 @@
                android:layout_alignParentBottom="true"
                app:layout_constraintBottom_toBottomOf="parent" />

-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>


        <LinearLayout
@@ -281,14 +281,14 @@
            </LinearLayout>


-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:paddingStart="100dp"
                android:paddingEnd="100dp">

-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/pin"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@@ -296,7 +296,7 @@
                    android:imeOptions="actionDone"
                    android:inputType="numberPassword" />

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

            <com.dd.CircularProgressButton
                android:id="@+id/pinButton"
--- a/res/layout/registration_lock_dialog_view.xml
+++ b/res/layout/registration_lock_dialog_view.xml
@@ -15,12 +15,12 @@
            android:layout_marginTop="10dp"
            android:text="@string/registration_lock_dialog_view__the_pin_can_consist_of_four_or_more_digits_if_you_forget_your_pin_you_could_be_locked_out_of_your_account_for_up_to_seven_days"/>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_marginTop="15dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/pin"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -28,15 +28,15 @@
                android:imeOptions="actionNext"
                android:hint="@string/registration_lock_dialog_view__enter_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>


-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_marginTop="15dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/repeat"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
                android:imeOptions="actionDone"
                android:hint="@string/registration_lock_dialog_view__confirm_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>


    <ProgressBar android:id="@+id/progress"
--- a/res/layout/registration_lock_reminder_view.xml
+++ b/res/layout/registration_lock_reminder_view.xml
@@ -23,21 +23,21 @@

    </LinearLayout>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingTop="40dp"
            android:paddingStart="80dp"
            android:paddingEnd="80dp">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/pin"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:inputType="numberPassword"
                android:hint="@string/registration_lock_reminder_view__enter_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>

    <TextView android:id="@+id/reminder"
              android:layout_width="match_parent"
--- a/res/layout/registration_welcome_activity.xml
+++ b/res/layout/registration_welcome_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="@color/loki_darkest_gray"
@@ -85,4 +85,4 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/scribble_select_sticker_activity.xml
+++ b/res/layout/scribble_select_sticker_activity.xml
@@ -5,14 +5,14 @@
              android:layout_height="match_parent"
              android:orientation="vertical">

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
            android:id="@+id/camera_sticker_tabs"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:tabBackground="@color/core_grey_90"
            app:tabMode="fixed"/>

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
            android:id="@+id/camera_sticker_pager"
            android:layout_width="match_parent"
            android:layout_height="0px"
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/stickers_recycler_view"
    android:layout_width="match_parent"
--- a/res/layout/search_toolbar.xml
+++ b/res/layout/search_toolbar.xml
@@ -6,7 +6,7 @@
       tools:parentTag="android.widget.LinearLayout"
       tools:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -8,7 +8,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_alignParentTop="true"
            android:layout_width="match_parent"
@@ -42,7 +42,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>


    <fragment android:id="@+id/contact_selection_list_fragment"
--- a/res/layout/sticker_keyboard_page.xml
+++ b/res/layout/sticker_keyboard_page.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/sticker_keyboard_list"
    android:layout_width="match_parent"
--- a/res/layout/sticker_management_activity.xml
+++ b/res/layout/sticker_management_activity.xml
@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/sticker_management_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/sticker_management_sticker_item.xml
+++ b/res/layout/sticker_management_sticker_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@@ -124,4 +124,4 @@
        app:layout_constraintTop_toBottomOf="@id/sticker_management_cover"
        app:layout_constraintEnd_toEndOf="parent"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/sticker_preview_activity.xml
+++ b/res/layout/sticker_preview_activity.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/sticker_install_toolbar"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
        app:layout_constraintEnd_toEndOf="@id/sticker_install_share_button"
        tools:visibility="visible"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/sticker_install_list"
        android:layout_width="0dp"
        android:layout_height="0dp"
@@ -125,11 +125,11 @@
        app:layout_constraintEnd_toEndOf="@id/sticker_install_list"
        app:layout_constraintStart_toStartOf="@id/sticker_install_list" />

-    <android.support.constraint.Barrier
+    <androidx.constraintlayout.widget.Barrier
        android:id="@+id/sticker_install_bottom_barrier"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:barrierDirection="top"
        app:constraint_referenced_ids="sticker_install_remove_button,sticker_install_button"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/switch_compat_preference.xml
+++ b/res/layout/switch_compat_preference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
                                        android:id="@android:id/checkbox"
                                        android:layout_width="wrap_content"
                                        android:layout_height="wrap_content"
--- a/res/layout/verify_display_fragment.xml
+++ b/res/layout/verify_display_fragment.xml
@@ -161,7 +161,7 @@
                      android:layout_marginTop="10dp"
                      android:paddingStart="20dp">

-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                    android:id="@+id/verified_switch"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"/>
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@@ -14,7 +14,7 @@
     limitations under the License.
 -->

-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:tools="http://schemas.android.com/tools"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/incall_screen"
@@ -212,7 +212,7 @@
            android:layout_height="match_parent"
            tools:visibility="invisible"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/hangup_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -233,4 +233,4 @@
            android:layout_height="wrap_content"
            android:layout_marginBottom="16dp"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>