commit e50cd83daa53f2c0e61a456becf34ef99dd1cc58
author Gary Mai <garymai@google.com> Tue Apr 18 12:05:31 2017 -0700
committer Gary Mai <garymai@google.com> Tue Apr 18 12:07:35 2017 -0700
tree 5cba28bf56c7f7c7ea217d9cf968b2f10a02dbf8
parent 48ea6852618093ee67a62aaafd85aed124c6aa3a

Use generic video icon for tachyon calls

Test: Manually verified video reachable phones use the right colored
generic video icon but will intent the correct method of calling.

Bug: 36874501
Change-Id: I985ac8a4798a92948631793cb78bfb301b6d9115

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index f56234f..866d3b5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1803,24 +1803,16 @@
                     thirdExtras.putString(CallSubjectDialog.ARG_NUMBER_LABEL,
                             phoneLabel);
                 } else if (isVideoEnabled && (!isPresenceEnabled || isPresent)) {
-                        thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
-                        thirdAction = Entry.ACTION_INTENT;
-                        thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
-                                CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
-                        thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
-                        thirdContentDescription =
-                                res.getString(R.string.description_video_call);
+                    thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
+                    thirdAction = Entry.ACTION_INTENT;
+                    thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
+                            CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
+                    thirdIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.VIDEOCALL);
+                    thirdContentDescription =
+                            res.getString(R.string.description_video_call);
                 } else if (Flags.getInstance().getBoolean(Experiments.QUICK_CONTACT_VIDEO_CALL)
                         && ((PhoneDataItem) dataItem).isTachyonReachable()) {
-                    final Intent tachyonIntent = new Intent(Intent.ACTION_VIEW);
-                    final Uri uri = ContentUris.withAppendedId(Data.CONTENT_URI,
-                            ((PhoneDataItem) dataItem).getReachableDataItem().getId());
-                    tachyonIntent.setDataAndType(uri, MIMETYPE_TACHYON);
-                    tachyonIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.THIRD_PARTY);
-                    tachyonIntent.putExtra(EXTRA_THIRD_PARTY_ACTION, MIMETYPE_TACHYON);
-                    thirdIcon = ResolveCache.getInstance(context).getIcon(MIMETYPE_TACHYON,
-                            tachyonIntent);
-                    shouldApplyThirdIconColor = false;
+                    thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
                     thirdAction = Entry.ACTION_INTENT;
                     thirdIntent = new Intent("com.google.android.apps.tachyon.action.CALL");
                     thirdIntent.setData(