summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorJames Lemieux <jplemieux@google.com>2014-08-11 18:05:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-11 17:59:47 +0000
commit3ac30be5d27ce8657413fef6784655d299fff2e3 (patch)
tree0d073bfe419013622cfd111d1e8da3ac45f3741b /res/layout
parent418f38555c0bc6ff6c724f0bed6e7e897f4da91a (diff)
parent0101289456a0bb35ec6434d4c41aef502bda0724 (diff)
downloadandroid_packages_apps_UnifiedEmail-3ac30be5d27ce8657413fef6784655d299fff2e3.tar.gz
android_packages_apps_UnifiedEmail-3ac30be5d27ce8657413fef6784655d299fff2e3.tar.bz2
android_packages_apps_UnifiedEmail-3ac30be5d27ce8657413fef6784655d299fff2e3.zip
Merge "Takes more than one click to Undo Archive/Delete" into ub-gmail-ur14-dev
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/floating_actions.xml10
1 files changed, 8 insertions, 2 deletions
diff --git a/res/layout/floating_actions.xml b/res/layout/floating_actions.xml
index 19a0bf910..1ec5eb23c 100644
--- a/res/layout/floating_actions.xml
+++ b/res/layout/floating_actions.xml
@@ -32,8 +32,6 @@
android:layout_gravity="bottom"
android:background="@color/snack_bar_background_color"
android:clickable="true"
- android:paddingTop="@dimen/snack_bar_margin_vertical"
- android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:visibility="gone">
<!-- These children are visible when description and action text fit on one line -->
@@ -50,6 +48,8 @@
android:layout_marginLeft="@dimen/snack_bar_margin_horizontal"
android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
android:layout_weight="1"
+ android:paddingTop="@dimen/snack_bar_margin_vertical"
+ android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textColor="@android:color/white" />
<TextView
@@ -57,6 +57,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
+ android:paddingTop="@dimen/snack_bar_margin_vertical"
+ android:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textAllCaps="true"
android:textColor="@color/snack_bar_action_text_color"
style="@style/SnackBarActionTextStyle"/>
@@ -74,6 +76,8 @@
android:layout_height="wrap_content"
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
@@ -83,6 +87,8 @@
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:paddingBottom="@dimen/snack_bar_margin_vertical"
android:textAllCaps="true"
android:textColor="@color/snack_bar_action_text_color"
style="@style/SnackBarActionTextStyle"/>