summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-06-12 16:22:59 -0700
committerAndrew Lee <anwlee@google.com>2015-06-12 16:22:59 -0700
commitb0b57a10fbb9bec5c80d7adad8f65750a2f96e1b (patch)
tree1116c4e16c191b85eaa47959b822df2a10e33c29 /res
parent44919b041bd28792e18cfa65ea6868da3d8b9f52 (diff)
Convert to primary action button on call log items.
+ This is the call button on the standard call log list item, but will be play on voicemail call log list items. + Add call "list" action for voicemail call log list items. Change-Id: I4b115b96738b77c8a19c1071d5290e65f93395ac
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_detail.xml6
-rw-r--r--res/layout/call_log_list_item.xml10
-rw-r--r--res/layout/call_log_list_item_actions.xml15
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimens.xml2
5 files changed, 24 insertions, 11 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index abc0fbb70..fde1de5c1 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -85,13 +85,13 @@
<ImageView
android:id="@+id/call_back_button"
- android:layout_width="@dimen/call_button_dimen"
- android:layout_height="@dimen/call_button_dimen"
+ android:layout_width="@dimen/call_log_list_item_primary_action_dimen"
+ android:layout_height="@dimen/call_log_list_item_primary_action_dimen"
android:layout_marginEnd="16dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_call_24dp"
android:scaleType="center"
- android:tint="@color/recent_call_log_item_phone_icon_tint"
+ android:tint="@color/call_log_list_item_primary_action_icon_tint"
android:contentDescription="@string/description_call_log_call_action"
android:visibility="gone" />
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 7fce595a8..ec512b67f 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -137,16 +137,14 @@
</LinearLayout>
<ImageView
- android:id="@+id/call_icon"
- android:layout_width="@dimen/call_button_dimen"
- android:layout_height="@dimen/call_button_dimen"
+ android:id="@+id/primary_action_button"
+ android:layout_width="@dimen/call_log_list_item_primary_action_dimen"
+ android:layout_height="@dimen/call_log_list_item_primary_action_dimen"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:background="?android:attr/selectableItemBackgroundBorderless"
- android:src="@drawable/ic_call_24dp"
android:scaleType="center"
- android:tint="@color/recent_call_log_item_phone_icon_tint"
- android:contentDescription="@string/description_call_log_call_action"
+ android:tint="@color/call_log_list_item_primary_action_icon_tint"
android:visibility="gone" />
</LinearLayout>
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index d4c970655..4d3fb75e4 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -29,6 +29,21 @@
android:layout_height="wrap_content" />
<LinearLayout
+ android:id="@+id/call_action"
+ style="@style/CallLogActionStyle">
+
+ <ImageView
+ style="@style/CallLogActionIconStyle"
+ android:src="@drawable/ic_call_24dp" />
+
+ <TextView
+ android:id="@+id/call_action_text"
+ style="@style/CallLogActionTextStyle"
+ android:text="@string/description_call_log_call_action" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/video_call_action"
style="@style/CallLogActionStyle">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 352bce562..f83c3284c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,7 +37,7 @@
<color name="call_log_voicemail_highlight_color">#33b5e5</color>
<!-- Tint of the recent card phone icon; 30% black -->
- <color name="recent_call_log_item_phone_icon_tint">#4d000000</color>
+ <color name="call_log_list_item_primary_action_icon_tint">#4d000000</color>
<color name="voicemail_playback_icon_tint">#8e8e8e</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9d987e851..bcde855b5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -133,5 +133,5 @@
<dimen name="preference_side_margin">16dp</dimen>
<dimen name="preference_summary_line_spacing_extra">4dp</dimen>
- <dimen name="call_button_dimen">36dp</dimen>
+ <dimen name="call_log_list_item_primary_action_dimen">36dp</dimen>
</resources>