summaryrefslogtreecommitdiffstats
path: root/src/com/android/dialer/calllog/CallLogAdapter.java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-08-25 19:04:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-25 19:04:28 +0000
commit59dc8dbf566e6900c81feec1756014d2a2fd0843 (patch)
tree2cc513396812ff074b175f54d6062a51bd115ef1 /src/com/android/dialer/calllog/CallLogAdapter.java
parente7aee4b37ce6aab2f68140aebdcaf3ca7c8a9ebe (diff)
parentac7f2354a58bac2099b6a9442f6c8388fcf1c148 (diff)
downloadandroid_packages_apps_Dialer-59dc8dbf566e6900c81feec1756014d2a2fd0843.tar.gz
android_packages_apps_Dialer-59dc8dbf566e6900c81feec1756014d2a2fd0843.tar.bz2
android_packages_apps_Dialer-59dc8dbf566e6900c81feec1756014d2a2fd0843.zip
Merge "Hiding VideoCall button in call log when video is not available." into lmp-dev
Diffstat (limited to 'src/com/android/dialer/calllog/CallLogAdapter.java')
-rw-r--r--src/com/android/dialer/calllog/CallLogAdapter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index e7d5a4ae5..d0c7632d9 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -41,6 +41,7 @@ import android.widget.TextView;
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 @@ public class CallLogAdapter extends GroupingListAdapter
}
// 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);