summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/drawable-hdpi/ic_fav_undo_dk.pngbin0 -> 1324 bytes
-rw-r--r--res/drawable-mdpi/ic_fav_undo_dk.pngbin0 -> 962 bytes
-rw-r--r--res/drawable-xhdpi/ic_fav_undo_dk.pngbin0 -> 1784 bytes
-rw-r--r--res/layout/phone_favorite_regular_row_view.xml48
-rw-r--r--res/layout/phone_favorite_tile_view.xml60
-rw-r--r--res/values/colors.xml3
-rw-r--r--src/com/android/dialer/list/PhoneFavoritesTileAdapter.java2
7 files changed, 70 insertions, 43 deletions
diff --git a/res/drawable-hdpi/ic_fav_undo_dk.png b/res/drawable-hdpi/ic_fav_undo_dk.png
new file mode 100644
index 000000000..1279114f2
--- /dev/null
+++ 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
new file mode 100644
index 000000000..78a3437dd
--- /dev/null
+++ 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
new file mode 100644
index 000000000..ef0b84e42
--- /dev/null
+++ 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 532e85854..137d3da60 100644
--- a/res/layout/phone_favorite_regular_row_view.xml
+++ b/res/layout/phone_favorite_regular_row_view.xml
@@ -28,7 +28,7 @@
android:background="?android:attr/selectableItemBackground" >
<com.android.contacts.common.widget.LayoutSuppressingQuickContactBadge
- android:id="@id/contact_tile_quick"
+ android:id="@+id/contact_tile_quick"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_alignParentLeft="true"
@@ -38,7 +38,7 @@
android:focusable="true" />
<TextView
- android:id="@+id/contact_tile_name"
+ android:id="@id/contact_tile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dip"
@@ -52,6 +52,7 @@
android:fadingEdgeLength="3dip"
android:ellipsize="marquee"
android:textAlignment="viewStart" />
+
</RelativeLayout>
<LinearLayout
@@ -72,28 +73,39 @@
android:layout_weight="1"
android:text="@string/favorite_hidden"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
+ android:fontFamily="sans-serif"
+ android:textStyle="italic"
+ android:textSize="14sp"
+ android:textColor="@color/undo_dialogue_text_color"
android:singleLine="true"
- android:layout_gravity="center_vertical"
+ android:gravity="center_vertical"
android:textDirection="ltr"
- android:textAlignment="viewStart" />
+ android:textAlignment="center" />
- <TextView
+ <LinearLayout
android:id="@+id/favorite_remove_undo_button"
+ android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="0.5"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:text="@string/favorite_hidden_undo"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
- android:gravity="end"
- android:layout_gravity="center_vertical"
- android:clickable="true"/>
+ android:clickable="true"
+ android:layout_marginRight="30dp"
+ android:gravity="center_vertical">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_fav_undo_dk"/>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:textSize="13sp"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/favorite_hidden_undo"
+ android:textColor="@color/undo_dialogue_text_color"
+ android:textAlignment="center"/>
+ </LinearLayout>
</LinearLayout>
</view>
diff --git a/res/layout/phone_favorite_tile_view.xml b/res/layout/phone_favorite_tile_view.xml
index 2865c2ade..6242b96a2 100644
--- a/res/layout/phone_favorite_tile_view.xml
+++ b/res/layout/phone_favorite_tile_view.xml
@@ -15,18 +15,17 @@
-->
<view
xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="@null"
android:paddingBottom="1dip"
android:paddingRight="1dip"
android:paddingEnd="1dip"
+ android:background="@color/background_dialer_light"
class="com.android.dialer.list.PhoneFavoriteSquareTileView" >
<RelativeLayout
android:id="@+id/contact_tile_favorite_card"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:focusable="true"
- android:background="?android:attr/selectableItemBackground" >>
+ android:focusable="true">
<com.android.contacts.common.widget.LayoutSuppressingImageView
android:id="@+id/contact_tile_image"
@@ -99,34 +98,45 @@
<TextView
android:id="@+id/favorite_tile_remove_dialogue_text"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:text="@string/favorite_hidden"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
- android:singleLine="true"
- android:layout_gravity="center_horizontal"
+ android:fontFamily="sans-serif"
+ android:textStyle="italic"
+ android:textSize="14sp"
+ android:textColor="@color/undo_dialogue_text_color"
+ android:lines="2"
+ android:paddingTop="22dp"
android:textDirection="ltr"
- android:textAlignment="viewStart" />
+ android:textAlignment="center" />
- <TextView
+ <LinearLayout
android:id="@+id/favorite_tile_remove_undo_button"
- android:layout_width="wrap_content"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="0.5"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:text="@string/favorite_hidden_undo"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip"
- android:gravity="end"
- android:layout_gravity="center_horizontal"
- android:clickable="true"/>
+ android:layout_alignParentLeft="true"
+ android:clickable="true"
+ android:layout_weight="1"
+ android:layout_gravity="bottom">
- </LinearLayout>
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_fav_undo_dk"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif-light"
+ android:textSize="13sp"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:text="@string/favorite_hidden_undo"
+ android:textColor="@color/undo_dialogue_text_color"
+ android:textAlignment="center"/>
+ </LinearLayout>
+ </LinearLayout>
</view>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2fc78b895..085817ea6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -71,4 +71,7 @@
<!-- Color of the contact name in favorite tiles -->
<color name="contact_tile_name_color">#f0f0f0</color>
+
+ <!-- Undo dialogue color -->
+ <color name="undo_dialogue_text_color">#4d4d4d</color>
</resources>
diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
index ab42888e7..29ce031cb 100644
--- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
+++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java
@@ -617,6 +617,8 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter {
columnCounter < list.size() ? list.get(columnCounter) : null;
addTileFromEntry(entry, columnCounter, isLastRow);
}
+ setPressed(false);
+ getBackground().setAlpha(255);
}
private void addTileFromEntry(ContactEntry entry, int childIndex, boolean isLastRow) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 15:50:37 +0000