summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJames Lemieux <jplemieux@google.com>2014-08-19 23:21:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 21:23:09 +0000
commit445f058203e6c7f221a655cfe774502e6413131b (patch)
tree9f2acdbfc5c17fb1016933a2fa381fd1ce73fb3b /res
parentb138702f3188df712f94973f5460de39a88c5157 (diff)
parent995814799eb853c71bb93aa7aeecbf3ac46db25b (diff)
downloadandroid_packages_apps_UnifiedEmail-445f058203e6c7f221a655cfe774502e6413131b.tar.gz
android_packages_apps_UnifiedEmail-445f058203e6c7f221a655cfe774502e6413131b.tar.bz2
android_packages_apps_UnifiedEmail-445f058203e6c7f221a655cfe774502e6413131b.zip
Merge "Fix multi-line snackbar layout on phones." into ub-gmail-ur14-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/floating_actions.xml6
1 files changed, 1 insertions, 5 deletions
diff --git a/res/layout/floating_actions.xml b/res/layout/floating_actions.xml
index 9984cda60..125b5d6f6 100644
--- a/res/layout/floating_actions.xml
+++ b/res/layout/floating_actions.xml
@@ -78,17 +78,13 @@
android:layout_marginLeft="@dimen/snack_bar_margin_horizontal"
android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
android:paddingTop="@dimen/snack_bar_margin_vertical"
- android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textColor="@android:color/white" />
<TextView
android:id="@+id/multiline_action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_marginLeft="@dimen/snack_bar_margin_horizontal"
- android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
- android:paddingTop="@dimen/snack_bar_margin_vertical"
+ android:paddingTop="8dp"
android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textAllCaps="true"
android:textColor="@color/snack_bar_action_text_color"