merged upstream/dev

This commit is contained in:
yausername 2019-11-16 04:37:14 +05:30
commit ca9dff049c
361 changed files with 16088 additions and 11403 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.NavigationView android:id="@+id/navigation_layout"
<com.google.android.material.navigation.NavigationView android:id="@+id/navigation_layout"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
@ -10,7 +10,7 @@
android:focusable="true"
>
<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/navigation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -33,4 +33,4 @@
android:layout_alignParentBottom="true">
</LinearLayout>
</android.support.design.widget.NavigationView>
</com.google.android.material.navigation.NavigationView>