Merge "Rename dialpad fragment layout file"
diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml
index 7714178..cdee279 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 dc3ee11..615744c 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 03c8553..7e18012 100644
--- a/InCallUI/src/com/android/incallui/AnswerPresenter.java
+++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java
@@ -55,7 +55,7 @@
}
call = calls.getVideoUpgradeRequestCall();
Log.d(this, "getVideoUpgradeRequestCall call =" + call);
- if (call == null) {
+ if (call != null) {
processVideoUpgradeRequestCall(call);
}
} else {