diff options
author | Andrew Sapperstein <asapperstein@google.com> | 2014-04-07 17:15:00 -0700 |
---|---|---|
committer | Andrew Sapperstein <asapperstein@google.com> | 2014-04-07 17:15:00 -0700 |
commit | a13b1eb564e8fe866165515e35670189fd219641 (patch) | |
tree | 37f54aeddc74ddf133f8745bfe006130e351de7a | |
parent | 046c6440b01c4ef46db9c32b6dd16777d0371c03 (diff) | |
download | android_packages_apps_UnifiedEmail-a13b1eb564e8fe866165515e35670189fd219641.tar.gz android_packages_apps_UnifiedEmail-a13b1eb564e8fe866165515e35670189fd219641.tar.bz2 android_packages_apps_UnifiedEmail-a13b1eb564e8fe866165515e35670189fd219641.zip |
RTL - fix swipe leave behind. b/13812107.
Change-Id: I5f07f1d10ebe3aa985d8b5ea1fdce95e5fa262ff
-rw-r--r-- | res/layout/swipe_leavebehind_body.xml | 9 | ||||
-rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 9 | ||||
-rw-r--r-- | res/values/dimen.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 9 |
4 files changed, 26 insertions, 5 deletions
diff --git a/res/layout/swipe_leavebehind_body.xml b/res/layout/swipe_leavebehind_body.xml index aff4aa3c2..cfe88581d 100644 --- a/res/layout/swipe_leavebehind_body.xml +++ b/res/layout/swipe_leavebehind_body.xml @@ -29,9 +29,9 @@ android:singleLine="true" android:textColor="@android:color/white" android:textAppearance="?android:attr/textAppearanceMedium" - android:paddingLeft="16dip" android:clickable="true" - android:gravity="center_vertical"/> + android:gravity="center_vertical" + style="@style/UndoDescriptionStyle" /> <View android:id="@+id/undo_separator" @@ -45,11 +45,10 @@ android:id="@+id/undo_icon" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingLeft="12dip" - android:paddingRight="8dip" android:src="@drawable/ic_menu_revert_holo_dark" android:background="?android:attr/selectableItemBackground" - android:duplicateParentState="true" /> + android:duplicateParentState="true" + style="@style/UndoIconStyle" /> <TextView android:id="@+id/undo_text" diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index 0e2d0da11..70a0afe7f 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -378,4 +378,13 @@ <item name="android:layout_marginStart">@dimen/teaser_arrow_margin_start</item> <item name="android:layout_marginEnd">@dimen/teaser_arrow_margin_end</item> </style> + + <style name="UndoDescriptionStyle"> + <item name="android:paddingStart">@dimen/undo_description_padding</item> + </style> + + <style name="UndoIconStyle"> + <item name="android:paddingStart">@dimen/undo_icon_padding_start</item> + <item name="android:paddingEnd">@dimen/undo_icon_padding_end</item> + </style> </resources> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 47d98c8b3..c53c5ccb3 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -214,4 +214,8 @@ <dimen name="avatar_border_width">.5dp</dimen> <dimen name="progress_bar_height">30dp</dimen> + + <dimen name="undo_description_padding">16dip</dimen> + <dimen name="undo_icon_padding_start">12dip</dimen> + <dimen name="undo_icon_padding_end">8dip</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index c208e354e..c4d762e30 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -919,4 +919,13 @@ <item name="android:layout_marginLeft">@dimen/teaser_arrow_margin_start</item> <item name="android:layout_marginRight">@dimen/teaser_arrow_margin_end</item> </style> + + <style name="UndoDescriptionStyle"> + <item name="android:paddingLeft">@dimen/undo_description_padding</item> + </style> + + <style name="UndoIconStyle"> + <item name="android:paddingLeft">@dimen/undo_icon_padding_start</item> + <item name="android:paddingRight">@dimen/undo_icon_padding_end</item> + </style> </resources> |