Merge "CAB mode? "Move to" optional" into jb-ub-mail-ur9
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index 1dcbeb9..2c833ca 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -44,7 +44,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/folder_list_item_left_margin"
- android:layout_marginRight="4dp"
android:visibility="gone" />
<LinearLayout
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index ff0f47d..101137b 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -63,7 +63,7 @@
<dimen name="spinner_frame_width">196dip</dimen>
<dimen name="folder_list_heading_padding_side">16dp</dimen>
<dimen name="folder_list_heading_padding_bottom">3dp</dimen>
- <dimen name="folder_list_item_left_margin">16dp</dimen>
+ <dimen name="folder_list_item_left_margin">9dp</dimen>
<dimen name="folder_list_item_right_margin">8dp</dimen>
<!-- Let's try to keep this consistent with color_block_height above, unless there's a good reason not to. -->
<dimen name="folder_swatch_height">6dip</dimen>