Takes more than one click to Undo Archive/Delete

b/16817429

I have changed the spacing around the action text (UNDO) to be
padding rather than margins. This provides more tap target slop
for the action text.

Change-Id: I8c2e56ff84a5a29846573fb2928cafc32d7f5cd5

4 files changed, 15 insertions, 7 deletions

diff --git a/res/layout-sw600dp/floating_actions.xml b/res/layout-sw600dp/floating_actions.xml
index 476acd24a..84c4d4ee8 100644
--- a/res/layout-sw600dp/floating_actions.xml
+++ b/res/layout-sw600dp/floating_actions.xml
@@ -30,8 +30,6 @@
         android:layout_marginBottom="@dimen/floating_action_bar_margin"
         android:background="@drawable/snack_bar_edge_tablet"
         android:clickable="true"
-        android:paddingTop="@dimen/snack_bar_margin_vertical"
-        android:paddingBottom="@dimen/snack_bar_margin_vertical"
         android:visibility="gone">
 
         <LinearLayout
@@ -48,6 +46,8 @@
                 android:layout_marginRight="@dimen/snack_bar_margin_horizontal"
                 android:minWidth="240dp"
                 android:maxWidth="350dp"
+                android:paddingTop="@dimen/snack_bar_margin_vertical"
+                android:paddingBottom="@dimen/snack_bar_margin_vertical"
                 android:textColor="@android:color/white" />
 
             <TextView
@@ -55,6 +55,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" />
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"/>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 93c9ea771..1accc2963 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -197,7 +197,7 @@
 
     <style name="SnackBarActionTextStyle">
         <item name="android:layout_gravity">end</item>
-        <item name="android:layout_marginEnd">@dimen/snack_bar_margin_horizontal</item>
+        <item name="android:paddingEnd">@dimen/snack_bar_margin_horizontal</item>
     </style>
 
     <style name="FolderSelectionItemStyle" parent="AbstractFolderSelectionItemStyle">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5732a7ac6..1f48f1d61 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto">
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Compose Styles -->
     <style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView">
         <item name="android:layout_gravity">center_vertical</item>
@@ -217,7 +217,7 @@
 
     <style name="SnackBarActionTextStyle">
         <item name="android:layout_gravity">right</item>
-        <item name="android:layout_marginRight">@dimen/snack_bar_margin_horizontal</item>
+        <item name="android:paddingRight">@dimen/snack_bar_margin_horizontal</item>
     </style>
 
     <!-- Undo bar styles -->