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

diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index 86b64be..cf68f44 100644 (file)
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -93,7 +93,11 @@
                 android:text="@string/app_name"
                 android:textColor="#FFF"
                 android:paddingLeft="16dp"
-                android:textSize="24sp" />
+                android:paddingRight="16dp"
+                android:textSize="24sp"
+                android:ellipsize="end"
+                android:singleLine="true"
+                />
         </LinearLayout>
     </RelativeLayout>
 </merge>
\ No newline at end of file