Merge "Add disambiguation phone icon to recent phone call" into lmp-dev
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 1e61f77..ad382e5 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -132,6 +132,16 @@
/>
</LinearLayout>
</LinearLayout>
+ <ImageView
+ android:id="@+id/call_indicator_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_results_phone"
+ android:tint="@color/recent_call_log_item_phone_icon_tint"
+ android:alpha="0.3"
+ android:visibility="gone"
+ />
</LinearLayout>
<!-- Viewstub with additional expandable actions for a call log entry -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d7a929f..44346bc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,6 +33,9 @@
<!-- Color of the text describing an unconsumed voicemail. -->
<color name="call_log_voicemail_highlight_color">#33b5e5</color>
+ <!-- Tint of the recent card phone icon -->
+ <color name="recent_call_log_item_phone_icon_tint">#000000</color>
+
<!--
Colour of voicemail progress bar to the right of position indicator.
Same as the background color of the dialer
@@ -93,4 +96,6 @@
<color name="actionbar_icon_color">#ffffff</color>
<color name="dialer_dialpad_touch_tint">#331dc7db</color>
+
+
</resources>
diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index e856d80..b20df06 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -263,6 +263,8 @@
callLogItem.findViewById(R.id.call_log_row)
.setBackgroundColor(mShortCardBackgroundColor);
+
+ callLogItem.findViewById(R.id.call_indicator_icon).setVisibility(View.VISIBLE);
}
@Override