Merge "Use same dismissed tombstone state as Gmail" into klp-dev
diff --git a/res/drawable-hdpi/ic_fav_undo_dk.png b/res/drawable-hdpi/ic_fav_undo_dk.png
index 1279114..8c1b451 100644
--- a/res/drawable-hdpi/ic_fav_undo_dk.png
+++ b/res/drawable-hdpi/ic_fav_undo_dk.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_fav_undo_dk.png b/res/drawable-mdpi/ic_fav_undo_dk.png
index 78a3437..9655590 100644
--- a/res/drawable-mdpi/ic_fav_undo_dk.png
+++ b/res/drawable-mdpi/ic_fav_undo_dk.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_fav_undo_dk.png b/res/drawable-xhdpi/ic_fav_undo_dk.png
index ef0b84e..4e1b651 100644
--- a/res/drawable-xhdpi/ic_fav_undo_dk.png
+++ b/res/drawable-xhdpi/ic_fav_undo_dk.png
Binary files differ
diff --git a/res/layout/phone_favorite_regular_row_view.xml b/res/layout/phone_favorite_regular_row_view.xml
index 8ac01d6..bf63642 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 a0ef1af..1117bdc 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 e03e919..ef45e4c 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>
