summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-08-21 23:46:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 23:46:21 +0000
commit95f6cfe4c999e3fa802ef4862a7f78b8148a7788 (patch)
tree50d81405c111a98b890c329dee212f9ea86fc7f7
parent9241faa146d7a9dc65d439cfc9e2c48b1b058cef (diff)
parent6fad34b5fd3edfe8a14c038a72195b69afd503ba (diff)
am 6fad34b5: Merge "Update UI for Caller ID by Google is enabled badge." into lmp-dev
* commit '6fad34b5fd3edfe8a14c038a72195b69afd503ba': Update UI for Caller ID by Google is enabled badge.
-rw-r--r--res/layout/call_log_list_item_extra.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index fbf71f64d..3623e3f94 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -24,8 +24,6 @@
<View android:layout_width="match_parent"
android:layout_height="1px"
- android:layout_marginStart="@dimen/call_log_outer_margin"
- android:layout_marginEnd="@dimen/call_log_outer_margin"
android:background="@color/favorite_contacts_separator_color"/>
<LinearLayout android:id="@+id/badge_link_container"
@@ -40,9 +38,11 @@
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/badge_image"
+ android:tint="@color/dialpad_primary_text_color"
android:padding="@dimen/call_log_outer_margin"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingStart="@dimen/call_log_start_margin"
android:id="@+id/badge_text"
android:textColor="@color/dialpad_primary_text_color"
android:layout_gravity="center_vertical"
@@ -50,8 +50,11 @@
<ImageView android:id="@+id/dismiss_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="8dip"
+ android:layout_gravity="center_vertical"
+ android:layout_marginEnd="@dimen/call_log_icon_margin"
android:src="@drawable/ic_close_dk"
+ android:tint="@color/recent_call_log_item_phone_icon_tint"
+ android:alpha="0.3"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone"
android:contentDescription="@string/description_dismiss"/>