commit 59dc8dbf566e6900c81feec1756014d2a2fd0843
author Tyler Gunn <tgunn@google.com> Mon Aug 25 19:04:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 25 19:04:28 2014 +0000
tree 2cc513396812ff074b175f54d6062a51bd115ef1
parent e7aee4b37ce6aab2f68140aebdcaf3ca7c8a9ebe
parent ac7f2354a58bac2099b6a9442f6c8388fcf1c148

Merge "Hiding VideoCall button in call log when video is not available." into lmp-dev

src/com/android/dialer/calllog/CallLogAdapter.java

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index e7d5a4a..d0c7632 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -41,6 +41,7 @@
 import android.widget.Toast;
 
 import com.android.common.widget.GroupingListAdapter;
+import com.android.contacts.common.CallUtil;
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.util.UriUtils;
@@ -992,7 +993,8 @@
         }
 
         // If one of the calls had video capabilities, show the video call button.
-        if (canPlaceCallToNumber && views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
+        if (CallUtil.isVideoEnabled(mContext) && canPlaceCallToNumber &&
+                views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
             views.videoCallButtonView.setTag(
                     IntentProvider.getReturnVideoCallIntentProvider(views.number));
             views.videoCallButtonView.setVisibility(View.VISIBLE);