Skip to content
Snippets Groups Projects
Commit 2a7990f5 authored by Torsten Grote's avatar Torsten Grote
Browse files

Merge branch '334-nav-menu-button-crash' into 'master'

android.support.v7.widget.AppCompatButton -> Button to use AppCompat inflater

Fixes the following crash that occurs after upgrading to support 23.3.0:
https://code.google.com/p/android/issues/detail?id=174871

Closes #334.

See merge request !200
parents 0d16dd03 92d3e02c
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/nav_btn_contacts" android:id="@+id/nav_btn_contacts"
style="@style/NavMenuButton" style="@style/NavMenuButton"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_height="@dimen/nav_separator_height" android:layout_height="@dimen/nav_separator_height"
android:layout_marginLeft="@dimen/margin_large"/> android:layout_marginLeft="@dimen/margin_large"/>
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/nav_btn_forums" android:id="@+id/nav_btn_forums"
style="@style/NavMenuButton" style="@style/NavMenuButton"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
android:layout_height="@dimen/margin_separator" android:layout_height="@dimen/margin_separator"
android:layout_marginLeft="@dimen/margin_large"/> android:layout_marginLeft="@dimen/margin_large"/>
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/nav_btn_settings" android:id="@+id/nav_btn_settings"
style="@style/NavMenuButton" style="@style/NavMenuButton"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
android:layout_height="@dimen/margin_separator" android:layout_height="@dimen/margin_separator"
android:layout_marginLeft="@dimen/margin_large"/> android:layout_marginLeft="@dimen/margin_large"/>
<android.support.v7.widget.AppCompatButton <Button
android:id="@+id/nav_btn_signout" android:id="@+id/nav_btn_signout"
style="@style/NavMenuButton" style="@style/NavMenuButton"
android:layout_width="match_parent" android:layout_width="match_parent"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment