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_intro.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_intro.xml')
| -rw-r--r-- | app/src/main/res/layout/activity_intro.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml index 839e33a9..e61a618d 100644 --- a/app/src/main/res/layout/activity_intro.xml +++ b/app/src/main/res/layout/activity_intro.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" android:layout_width="match_parent" android:layout_height="match_parent" @@ -14,14 +14,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/intro_bar_guide" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_end="@dimen/intro_bar_height" /> - <android.support.v4.view.ViewPager + <androidx.viewpager.widget.ViewPager android:id="@+id/intro_viewpager" android:layout_width="0dp" android:layout_height="0dp" @@ -60,4 +60,4 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/intro_bar_guide" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |