summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-11-17 18:21:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 18:21:14 +0000
commit56fc10a17e0d332ba99fc6a254ade534c851cece (patch)
tree7f168c2026530d6a99d346dbad3704295256500a /InCallUI
parentf3c5a1b38c3a1c52577fe7c5bb969a298010fa46 (diff)
parentb64e5cb7cf4f790cd51b7ed6b8b0d9ff9fd1993b (diff)
am 55a5ea5e: am 65c7d6f7: Merge "Removed unused VideoCallFragment" into lmp-mr1-dev
* commit '55a5ea5e18ad8b966f2947973a39c519cfe8ef3b': Removed unused VideoCallFragment
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout-land/call_card_content.xml7
-rw-r--r--InCallUI/res/layout/call_card_content.xml7
2 files changed, 0 insertions, 14 deletions
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index 0bb45a244..496b6b399 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -71,13 +71,6 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/photo" />
- <fragment android:name="com.android.incallui.VideoCallFragment"
- android:layout_alignParentStart="true"
- android:layout_gravity="start|center_vertical"
- android:id="@+id/videoCallFragment"
- 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"
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index a5fd8f72a..7a42586ea 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -70,13 +70,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"