Use carrier presence when showing the video call icon.
- Removed some unused video assets.
- Added carrier_presence to the ContactLoader queries (this supports
load in the quick contacts view, as well as in the dialer search results).
- In search results (ContactListItemView), moved label before phone
number (per UX).
Bug: 20257833
Change-Id: I838dbf6c58939faab6d36f4afa70587b07f85f63
diff --git a/res-common/drawable-xxxhdpi/ic_rx_videocam.png b/res-common/drawable-xxxhdpi/ic_rx_videocam.png
deleted file mode 100755
index 095e090..0000000
--- a/res-common/drawable-xxxhdpi/ic_rx_videocam.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xxxhdpi/ic_tx_videocam.png b/res-common/drawable-xxxhdpi/ic_tx_videocam.png
deleted file mode 100755
index 79ea67b..0000000
--- a/res-common/drawable-xxxhdpi/ic_tx_videocam.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable/ic_search_video_call.xml b/res-common/drawable/ic_search_video_call.xml
new file mode 100644
index 0000000..c2390e5
--- /dev/null
+++ b/res-common/drawable/ic_search_video_call.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_videocam"
+ android:autoMirrored="true"
+ android:tint="@color/search_video_call_icon_tint" />
diff --git a/res-common/values/attrs.xml b/res-common/values/attrs.xml
index 64397ca..79d4ee7 100644
--- a/res-common/values/attrs.xml
+++ b/res-common/values/attrs.xml
@@ -62,6 +62,8 @@
<attr name="list_item_text_offset_top" format="dimension"/>
<attr name="list_item_data_width_weight" format="integer"/>
<attr name="list_item_label_width_weight" format="integer"/>
+ <attr name="list_item_video_call_icon_size" format="dimension"/>
+ <attr name="list_item_video_call_icon_margin" format="dimension"/>
</declare-styleable>
<declare-styleable name="ContactBrowser">
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index cf2dad3..339b0e3 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -156,10 +156,10 @@
<!-- Text color used for character counter when the max limit has been exceeded -->
<color name="call_subject_limit_exceeded">#d1041c</color>
- <!-- Tint color for the call subhect history icon. -->
+ <!-- Tint color for the call subject history icon. -->
<color name="call_subject_history_icon">#000000</color>
- <!-- Divider line on the call subhect dialog. -->
+ <!-- Divider line on the call subject dialog. -->
<color name="call_subject_divider">#d8d8d8</color>
<!-- Text color for the SEND & CALL button on the call subject dialog. -->
@@ -167,4 +167,5 @@
<!-- Background color for the call subject history view. -->
<color name="call_subject_history_background">#ffffff</color>
+ <color name="search_video_call_icon_tint">@color/searchbox_hint_text_color</color>
</resources>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index fd80b1e..17b21eb 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -828,4 +828,10 @@
accounts list filter. For example: Google abc@gmail.com not checked, etc [CHAR LIMIT=30]-->
<string name="account_filter_view_not_checked"><xliff:g id="account_info">%s</xliff:g> not checked</string>
+ <!-- Description string for an action button to initiate a video call from search results.
+ Note: AccessibilityServices use this attribute to announce what the view represents.
+ This is especially valuable for views without textual representation like ImageView.
+
+ [CHAR LIMIT=NONE]-->
+ <string name="description_search_video_call">Place video call</string>
</resources>