Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout/drawer.xml
	res/layout/drawer_list_item.xml
	res/values/styles.xml
This commit is contained in:
Andy Scherzinger 2015-08-14 17:45:22 +02:00
commit a7859b4ab4

View file

@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="22dp"
android:paddingRight="@dimen/standard_padding"
android:paddingRight="@dimen/standard_margin"
android:textColor="@color/drawerMenuTextColor"
android:text="@string/app_name"
android:textStyle="bold"