diff options
| author | Hongwei Wang <hwwang@google.com> | 2013-09-06 21:14:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-06 21:14:44 +0000 |
| commit | 936a72b556c3df2b2744315905f42c6b6d826467 (patch) | |
| tree | 29e35fe59557b471d2f45fd59f5ad166089744bf | |
| parent | cbb72d24c4b353ecbc5d5cfaa6f56416fb3afd29 (diff) | |
| parent | addd02ecece2fb6bb0e78798d33994ace42c2bb7 (diff) | |
Merge "Use same dismissed tombstone state as Gmail" into klp-dev
| -rw-r--r-- | res/drawable-hdpi/ic_fav_undo_dk.png | bin | 1324 -> 1644 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_fav_undo_dk.png | bin | 962 -> 1384 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_fav_undo_dk.png | bin | 1784 -> 1935 bytes | |||
| -rw-r--r-- | res/layout/phone_favorite_regular_row_view.xml | 14 | ||||
| -rw-r--r-- | res/layout/phone_favorite_tile_view.xml | 1 | ||||
| -rw-r--r-- | 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 Binary files differindex 1279114f2..8c1b45125 100644 --- a/res/drawable-hdpi/ic_fav_undo_dk.png +++ b/res/drawable-hdpi/ic_fav_undo_dk.png diff --git a/res/drawable-mdpi/ic_fav_undo_dk.png b/res/drawable-mdpi/ic_fav_undo_dk.png Binary files differindex 78a3437dd..9655590a7 100644 --- a/res/drawable-mdpi/ic_fav_undo_dk.png +++ b/res/drawable-mdpi/ic_fav_undo_dk.png diff --git a/res/drawable-xhdpi/ic_fav_undo_dk.png b/res/drawable-xhdpi/ic_fav_undo_dk.png Binary files differindex ef0b84e42..4e1b65138 100644 --- a/res/drawable-xhdpi/ic_fav_undo_dk.png +++ b/res/drawable-xhdpi/ic_fav_undo_dk.png 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> |
