| commit | a9430830dcc0e3edcc99298b5c6d25dcc0eda784 | [log] [tgz] |
|---|---|---|
| author | Vikram Aggarwal <viki@google.com> | Thu May 09 20:24:57 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 09 20:24:58 2013 +0000 |
| tree | 3c1b88670dc9d3dd6dfebb2153793d434c32ea6f | |
| parent | e8a7c4c94cc2e391c6d2b5ade74ca842bc6b3a84 [diff] | |
| parent | 5b62a95abaefd7cc1d58b71a90edc6e5f26691ec [diff] |
Merge "Smaller stars" into jb-ub-mail-ur9
diff --git a/res/drawable-hdpi/ic_star_off.png b/res/drawable-hdpi/ic_star_off.png index 4476f91..cf1cd90 100644 --- a/res/drawable-hdpi/ic_star_off.png +++ b/res/drawable-hdpi/ic_star_off.png Binary files differ
diff --git a/res/drawable-hdpi/ic_star_on.png b/res/drawable-hdpi/ic_star_on.png index b4e7ceb..b694bbb 100644 --- a/res/drawable-hdpi/ic_star_on.png +++ b/res/drawable-hdpi/ic_star_on.png Binary files differ
diff --git a/res/drawable-mdpi/ic_star_off.png b/res/drawable-mdpi/ic_star_off.png index 3d959ef..522b5ab 100644 --- a/res/drawable-mdpi/ic_star_off.png +++ b/res/drawable-mdpi/ic_star_off.png Binary files differ
diff --git a/res/drawable-mdpi/ic_star_on.png b/res/drawable-mdpi/ic_star_on.png index 9f4318f..50dd679 100644 --- a/res/drawable-mdpi/ic_star_on.png +++ b/res/drawable-mdpi/ic_star_on.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_star_off.png b/res/drawable-xhdpi/ic_star_off.png index 72c50b7..a611a1f 100644 --- a/res/drawable-xhdpi/ic_star_off.png +++ b/res/drawable-xhdpi/ic_star_off.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_star_on.png b/res/drawable-xhdpi/ic_star_on.png index 31551a2..f77acd7 100644 --- a/res/drawable-xhdpi/ic_star_on.png +++ b/res/drawable-xhdpi/ic_star_on.png Binary files differ
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml index 350afd7..25eabe4 100644 --- a/res/layout/conversation_item_view_normal.xml +++ b/res/layout/conversation_item_view_normal.xml
@@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginTop="-6dp" + android:layout_marginTop="-1dp" android:src="@drawable/ic_star_off" /> <!-- we assume the star asset is less than 48dp wide -->
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml index b8bb2af..7bc05d3 100644 --- a/res/layout/conversation_item_view_normal_spacious.xml +++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -145,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginTop="-6dp" + android:layout_marginTop="-1dp" android:src="@drawable/ic_star_off" /> <!-- we assume the star asset is less than 48dp wide -->
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml index 949e964..3acda63 100644 --- a/res/layout/conversation_item_view_wide.xml +++ b/res/layout/conversation_item_view_wide.xml
@@ -140,7 +140,7 @@ android:id="@+id/star" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="-12dp" + android:layout_marginTop="-1dp" android:layout_marginLeft="32dp" android:src="@drawable/ic_star_off" />
diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 11d12a4..3c826ea 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml
@@ -31,7 +31,8 @@ <dimen name="compose_scrollview_width">700dp</dimen> <dimen name="color_block_width">32dip</dimen> <dimen name="color_block_height">6dip</dimen> - <dimen name="star_touch_slop">4dip</dimen> + <!-- The star is pretty small and does not have padding anymore, so the slop needs to be bigger--> + <dimen name="star_touch_slop">16dip</dimen> <dimen name="sender_image_touch_slop">8dip</dimen> <dimen name="move_slop">4dip</dimen> <dimen name="standard_scaled_dimen">100sp</dimen>
