diff options
author | Tyler Gunn <tgunn@google.com> | 2014-07-20 09:48:43 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2014-07-20 09:48:43 -0700 |
commit | 804baccc3aeed4ed00d1f0a62ecc37fb5ea6d9fd (patch) | |
tree | ff6168b86576f69061cee8a900df9be40f9d895a /InCallUI/res | |
parent | 77e58350baa664c832aca01d963a0ecc76e7585f (diff) |
Video call surfaces and changing to video UI on videoState change.
Bug: 16012946
Change-Id: I1e86b172d46d3e67eff210d9f56e03a2e6c93853
Diffstat (limited to 'InCallUI/res')
-rw-r--r-- | InCallUI/res/layout/call_card_content.xml | 5 | ||||
-rw-r--r-- | InCallUI/res/layout/video_call_fragment.xml | 28 | ||||
-rw-r--r-- | InCallUI/res/layout/video_call_views.xml | 34 |
3 files changed, 67 insertions, 0 deletions
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml index c59c1c712..07b38860d 100644 --- a/InCallUI/res/layout/call_card_content.xml +++ b/InCallUI/res/layout/call_card_content.xml @@ -63,6 +63,11 @@ android:contentDescription="@string/contactPhoto" android:src="@drawable/picture_unknown" /> + <fragment android:name="com.android.incallui.VideoCallFragment" + android:id="@+id/videoCallFragment" + 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/res/layout/video_call_fragment.xml b/InCallUI/res/layout/video_call_fragment.xml new file mode 100644 index 000000000..d5e11ef4a --- /dev/null +++ b/InCallUI/res/layout/video_call_fragment.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ViewStub + android:id="@+id/videoCallViewsStub" + android:inflatedId="@+id/videoCallViews" + android:layout="@layout/video_call_views" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</FrameLayout>
\ No newline at end of file diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml new file mode 100644 index 000000000..08334b21e --- /dev/null +++ b/InCallUI/res/layout/video_call_views.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <SurfaceView + android:id="@+id/incomingVideo" + android:layout_gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <SurfaceView + android:id="@+id/previewVideo" + android:layout_gravity="bottom|right" + android:layout_margin="10dp" + android:layout_width="70dp" + android:layout_height="120dp" /> +</FrameLayout>
\ No newline at end of file |