Merge branch 'v2.4' into q-beta

This commit is contained in:
Mygod
2019-05-09 14:03:16 +08:00
10 changed files with 74 additions and 91 deletions

View File

@@ -10,7 +10,7 @@
android:orientation="vertical"
tools:context="be.mygod.vpnhotspot.MainActivity">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"

View File

@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"