From addd02ecece2fb6bb0e78798d33994ace42c2bb7 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 5 Sep 2013 14:21:54 -0700
Subject: Use same dismissed tombstone state as Gmail

Bug: 10509640

Changes
- Imported new undo arrows
- Added divider for undo in regular favorite row
- Removed italic in undo
- Align start for undo text

Change-Id: I3a962d842c588f4af9d9b694c1b5071665091f3a
---
 res/drawable-hdpi/ic_fav_undo_dk.png           | Bin 1324 -> 1644 bytes
 res/drawable-mdpi/ic_fav_undo_dk.png           | Bin 962 -> 1384 bytes
 res/drawable-xhdpi/ic_fav_undo_dk.png          | Bin 1784 -> 1935 bytes
 res/layout/phone_favorite_regular_row_view.xml |  14 +++++++++++---
 res/layout/phone_favorite_tile_view.xml        |   1 -
 res/values/dimens.xml                          |   1 +
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/res/drawable-hdpi/ic_fav_undo_dk.png b/res/drawable-hdpi/ic_fav_undo_dk.png
index 1279114f2..8c1b45125 100644
Binary files a/res/drawable-hdpi/ic_fav_undo_dk.png and b/res/drawable-hdpi/ic_fav_undo_dk.png differ
diff --git a/res/drawable-mdpi/ic_fav_undo_dk.png b/res/drawable-mdpi/ic_fav_undo_dk.png
index 78a3437dd..9655590a7 100644
Binary files a/res/drawable-mdpi/ic_fav_undo_dk.png and b/res/drawable-mdpi/ic_fav_undo_dk.png differ
diff --git a/res/drawable-xhdpi/ic_fav_undo_dk.png b/res/drawable-xhdpi/ic_fav_undo_dk.png
index ef0b84e42..4e1b65138 100644
Binary files a/res/drawable-xhdpi/ic_fav_undo_dk.png and b/res/drawable-xhdpi/ic_fav_undo_dk.png differ
diff --git a/res/layout/phone_favorite_regular_row_view.xml b/res/layout/phone_favorite_regular_row_view.xml
index 8ac01d666..bf63642e6 100644
--- a/res/layout/phone_favorite_regular_row_view.xml
+++ b/res/layout/phone_favorite_regular_row_view.xml
@@ -71,16 +71,24 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:paddingStart="@dimen/favorites_row_undo_text_side_padding"
+            android:paddingEnd="@dimen/favorites_row_undo_text_side_padding"
             android:text="@string/favorite_hidden"
             android:ellipsize="marquee"
             android:fontFamily="sans-serif"
-            android:textStyle="italic"
             android:textSize="14sp"
             android:textColor="@color/undo_dialogue_text_color"
             android:singleLine="true"
             android:gravity="center_vertical"
-            android:textDirection="ltr"
-            android:textAlignment="center" />
+            android:textDirection="ltr" />
+
+        <View
+            android:id="@+id/undo_separator"
+            android:layout_width="1dip"
+            android:layout_height="match_parent"
+            android:background="@color/undo_dialogue_text_color"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp" />
 
         <LinearLayout
             android:id="@+id/favorite_remove_undo_button"
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index a0ef1af0e..1117bdc88 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -104,7 +104,6 @@
             android:text="@string/favorite_hidden"
             android:ellipsize="marquee"
             android:fontFamily="sans-serif"
-            android:textStyle="italic"
             android:textSize="14sp"
             android:textColor="@color/undo_dialogue_text_color"
             android:lines="2"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e03e91916..ef45e4ca1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -65,5 +65,6 @@
     <dimen name="favorites_row_bottom_padding">8dp</dimen>
     <dimen name="favorites_row_start_padding">8dp</dimen>
     <dimen name="favorites_row_end_padding">8dp</dimen>
+    <dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
     <dimen name="recent_call_log_item_padding">8dp</dimen>
 </resources>
-- 
cgit v1.2.3