Merge pull request #362 from mapzen/chuck/login-layout

Scale login text and prevent wrapping
mapzen · Dec 11, 2014 · b65f7a3 · b65f7a3
2 parents faf43b7 + 6c4c4d8
commit b65f7a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/res/layout/login_page_4.xml b/res/layout/login_page_4.xml
@@ -23,6 +23,9 @@
         android:background="@drawable/signin_button"
         android:layout_marginBottom="40dp"
         android:layout_centerHorizontal="true"
+        android:singleLine="true"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:textSize="@dimen/button_font_size" />
 
     <LinearLayout

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -15,7 +15,7 @@
     <dimen name="logo_top_margin">180dp</dimen>
     <dimen name="button_side_padding">20dp</dimen>
     <dimen name="button_above_below_padding">14dp</dimen>
-    <dimen name="button_font_size">10pt</dimen>
+    <dimen name="button_font_size">18sp</dimen>
     <dimen name="result_pager_height">75dp</dimen>
     <dimen name="instruction_height">84dp</dimen>
     <dimen name="arrow_padding">15dp</dimen>