diff options
| -rw-r--r-- | InCallUI/res/layout-land/call_card_fragment.xml | 12 | ||||
| -rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 8 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml index 7714178f5..cdee27970 100644 --- a/InCallUI/res/layout-land/call_card_fragment.xml +++ b/InCallUI/res/layout-land/call_card_fragment.xml @@ -68,14 +68,6 @@ android:background="@android:color/white" android:src="@drawable/img_no_image_automirrored" /> - <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" - android:visibility="gone" /> - <include layout="@layout/manage_conference_call_button" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -86,7 +78,8 @@ android:layout_gravity="start|center_vertical" android:id="@+id/videoCallFragment" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:visibility="gone" /> <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout @@ -106,6 +99,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:indeterminate="true" /> + </FrameLayout> <!-- Placeholder for various fragments that are added dynamically underneath the caller info. --> diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index dc3ee118b..615744c79 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -72,13 +72,6 @@ android:background="@android:color/white" android:src="@drawable/img_no_image_automirrored" /> - <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" /> - <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> <FrameLayout android:id="@+id/progressSpinner" @@ -97,6 +90,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:indeterminate="true" /> + </FrameLayout> <!-- Secondary "Call info" block, for the background ("on hold") call. --> diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 03c85538e..7e18012bb 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -55,7 +55,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> } call = calls.getVideoUpgradeRequestCall(); Log.d(this, "getVideoUpgradeRequestCall call =" + call); - if (call == null) { + if (call != null) { processVideoUpgradeRequestCall(call); } } else { |