diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-15 13:31:40 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-04-15 13:31:40 -0700 |
| commit | fddbfbcd6cc080dc706a851374c4cc8bcbf61f81 (patch) | |
| tree | 763a045bcfbb0ed88279520c1fc2ef54991faeb0 /InCallUI | |
| parent | 01ad85125dd7cbe1107c679dcc362b9487700b9a (diff) | |
Fix build issues after the merge
Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 7 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index d28ffe018..615744c79 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -93,13 +93,6 @@ </FrameLayout> - <fragment android:name="com.android.incallui.VideoCallFragment" - android:id="@+id/videoCallFragment" - android:layout_alignParentTop="true" - android:layout_gravity="top|center_horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - <!-- Secondary "Call info" block, for the background ("on hold") call. --> <include layout="@layout/secondary_call_info" /> diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index cc13a87ef..43431c73c 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -375,8 +375,8 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto final boolean showMerge = call.can( android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE); final boolean showUpgradeToVideo = !isVideo - && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL) - && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE); + && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX) + && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX); final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE); |