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

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java b/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
index 1c65d7b4..094e51cd 100644
--- a/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/common/model/ContactLoaderTest.java
@@ -154,6 +154,7 @@ public class ContactLoaderTest extends LoaderTestCase {
         assertEquals(lookupUri, contact.getLookupUri());
         assertEquals(1, contact.getRawContacts().size());
         assertEquals(1, contact.getStatuses().size());
+        assertEquals(1, contact.getRawContacts().get(0).getDataItems().get(0).getCarrierPresence());
         mContactsProvider.verify();
     }
 
@@ -342,6 +343,7 @@ public class ContactLoaderTest extends LoaderTestCase {
 
                         Data.TIMES_USED,
                         Data.LAST_TIME_USED,
+                        Data.CARRIER_PRESENCE
                     })
                     .withSortOrder(Contacts.Entity.RAW_CONTACT_ID)
                     .returnRow(
@@ -382,7 +384,8 @@ public class ContactLoaderTest extends LoaderTestCase {
                         0,
 
                         0,
-                        0
+                        0,
+                        Data.CARRIER_PRESENCE_VT_CAPABLE
                     );
         }