diff options
author | Allan Wang <me@allanwang.ca> | 2018-12-24 01:49:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-24 01:49:57 -0500 |
commit | 2c02356c498b3db6f13bd7a3af8689c24ca224ea (patch) | |
tree | 726ad142a8a373715493cf602786361226f624ee /app/src/main/res/layout/activity_web_overlay.xml | |
parent | fce0bf0a6df09de78a804dc874f48f67336d9d9c (diff) | |
parent | 697d01882ba8b1dbb85484ba3bf6e810e32448fc (diff) | |
download | frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.gz frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.tar.bz2 frost-2c02356c498b3db6f13bd7a3af8689c24ca224ea.zip |
Merge branch 'dev' into update/coroutines
Diffstat (limited to 'app/src/main/res/layout/activity_web_overlay.xml')
-rw-r--r-- | app/src/main/res/layout/activity_web_overlay.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml index 55456fae..3d1b2446 100644 --- a/app/src/main/res/layout/activity_web_overlay.xml +++ b/app/src/main/res/layout/activity_web_overlay.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<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:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/overlay_main_content" @@ -8,7 +8,7 @@ android:fitsSystemWindows="true" tools:context=".activities.WebOverlayActivity"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/overlay_toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -23,4 +23,4 @@ android:layout_height="match_parent" android:layout_marginTop="?attr/actionBarSize" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> |