diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-08-26 04:52:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 04:52:42 +0000 |
| commit | 12b9da9016f68ad48ea800c8e0b9ab0aa3770453 (patch) | |
| tree | 0db29b51dc7bd36123b18556a3729973ee417d65 | |
| parent | eaf0ed231b0ccc8627fa5965a25284d0160308db (diff) | |
| parent | 9cb9a69453c3cd9adf8f1ea4a1a2ab91f4897a3d (diff) | |
am 9cb9a694: am 59dc8dbf: Merge "Hiding VideoCall button in call log when video is not available." into lmp-dev
* commit '9cb9a69453c3cd9adf8f1ea4a1a2ab91f4897a3d':
Hiding VideoCall button in call log when video is not available.
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 4 |
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); |