diff options
| author | Rekha Kumar <rekhak@codeaurora.org> | 2013-12-06 15:03:57 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-03-03 02:54:16 -0800 |
| commit | 252f2378d72d92bd64d21cffffcf06b0bfe28361 (patch) | |
| tree | 17550b196ecc0ae4b42812324efc017d5b48733c | |
| parent | 789e453f5ef5e3de921ad06f4131d117ac3297d8 (diff) | |
| download | packages_apps_InCallUI-252f2378d72d92bd64d21cffffcf06b0bfe28361.tar.gz packages_apps_InCallUI-252f2378d72d92bd64d21cffffcf06b0bfe28361.tar.bz2 packages_apps_InCallUI-252f2378d72d92bd64d21cffffcf06b0bfe28361.zip | |
IMS-VT: Surface Texture creation fix
-When upgrade from VoLTE to VT is done, camera surface texture and
far end surface texture are not created.
-Remove forced requestLayout from CallCardFragment's
showVideoCallWidgets method
Change-Id: Ie73b5ef081681769579beedf27fefbd1b68cc231
CRs-Fixed: 583967
| -rw-r--r-- | res/layout/invideocall_panel.xml | 9 | ||||
| -rw-r--r-- | res/layout/primary_call_info.xml | 8 | ||||
| -rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/res/layout/invideocall_panel.xml b/res/layout/invideocall_panel.xml index 12c72d57..0e48a994 100644 --- a/res/layout/invideocall_panel.xml +++ b/res/layout/invideocall_panel.xml @@ -30,7 +30,6 @@ --> <com.android.incallui.VideoCallPanel xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/videoCallPanel" - android:layout_below="@+id/primary_call_banner" android:layout_alignParentBottom="true" android:layout_width="match_parent" android:layout_height="match_parent" @@ -40,15 +39,15 @@ <!-- Row 1: The camera preview and the video stream from far end. --> <TextureView android:id="@+id/video_view" - android:layout_width="0dp" - android:layout_height="0dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" /> <TextureView android:id="@+id/camera_view" - android:layout_width="0dp" - android:layout_height="0dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" /> diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml index 58a30384..9a030a95 100644 --- a/res/layout/primary_call_info.xml +++ b/res/layout/primary_call_info.xml @@ -32,10 +32,6 @@ android:contentDescription="@string/contactPhoto" android:src="@drawable/picture_unknown"/> - <!-- Layout to replace the InCallContactPhoto with the video call panel - for a VT call. By default this view is not visible --> - <include layout="@layout/invideocall_panel" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -194,6 +190,10 @@ android:ellipsize="end"/> </LinearLayout> + <!-- Layout to replace the InCallContactPhoto with the video call panel + for a VT call. By default this view is not visible --> + <include layout="@layout/invideocall_panel" /> + </LinearLayout> diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index 5f045210..7c95bbf2 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/src/com/android/incallui/CallCardFragment.java @@ -646,7 +646,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mVideoCallPanel.setVisibility(View.VISIBLE); mVideoCallPanel.setPanelElementsVisibility(callType); mVideoCallPanel.startOrientationListener(true); - mVideoCallPanel.requestLayout(); } /** |