diff options
author | Eric Erfanian <erfanian@google.com> | 2017-04-06 23:16:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 23:16:42 +0000 |
commit | 28188020060d1ad3304dfa0367486ff5bb35da62 (patch) | |
tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml | |
parent | 34e183cfd77f68e0ade42d2080c76f54a319430d (diff) | |
parent | 01a86435499d66b267765f89b7dd9c83c158ddfe (diff) |
Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a
am: 01a8643549
Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f
Diffstat (limited to 'java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml')
-rw-r--r-- | java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml | 98 |
1 files changed, 40 insertions, 58 deletions
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml index 45a9c3392..4cafd68c6 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land_surfaceview.xml @@ -1,32 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black"> + android:background="@android:color/black" + android:keepScreenOn="true"> <SurfaceView android:id="@+id/videocall_video_remote" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" android:importantForAccessibility="no"/> - <ImageView - android:id="@+id/videocall_remote_off_blurred_image_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:scaleType="fitCenter"/> - <TextView android:gravity="center" android:id="@+id/videocall_remote_video_off" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerInParent="true" + android:layout_gravity="center" android:accessibilityTraversalBefore="@+id/videocall_speaker_button" android:drawablePadding="8dp" android:drawableTop="@drawable/quantum_ic_videocam_off_white_36" @@ -40,63 +31,54 @@ android:id="@+id/videocall_fullscreen_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentStart="true" android:background="@color/videocall_overlay_background_color"/> - <SurfaceView - android:id="@+id/videocall_video_preview" + <FrameLayout + android:id="@+id/videocall_preview_root" android:layout_width="@dimen/videocall_preview_width" android:layout_height="@dimen/videocall_preview_height" + android:layout_marginBottom="@dimen/videocall_preview_margin_bottom" android:layout_marginEnd="@dimen/videocall_preview_margin_end" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:importantForAccessibility="no"/> + android:background="@android:color/black" + android:layout_gravity="bottom|end"> - <ImageView - android:id="@+id/videocall_preview_off_blurred_image_view" - android:layout_width="@dimen/videocall_preview_width" - android:layout_height="@dimen/videocall_preview_height" - android:layout_marginEnd="@dimen/videocall_preview_margin_end" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:scaleType="center"/> + <SurfaceView + android:id="@+id/videocall_video_preview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:importantForAccessibility="no"/> + + <ImageView + android:id="@+id/videocall_video_preview_off_overlay" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:scaleType="center" + android:src="@drawable/quantum_ic_videocam_off_white_36" + android:visibility="gone" + android:importantForAccessibility="no" + tools:visibility="visible"/> + + <ImageView + android:id="@+id/videocall_video_preview_mute_overlay" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_gravity="center" + android:background="@drawable/videocall_background_circle_white" + android:contentDescription="@string/incall_content_description_muted" + android:scaleType="center" + android:src="@drawable/quantum_ic_mic_off_black_24" + android:visibility="gone" + tools:visibility="visible"/> + + </FrameLayout> <View android:id="@+id/videocall_green_screen_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentStart="true" android:background="@color/videocall_overlay_background_color"/> - <ImageView - android:id="@+id/videocall_video_preview_off_overlay" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/videocall_video_preview" - android:layout_alignLeft="@+id/videocall_video_preview" - android:layout_alignRight="@+id/videocall_video_preview" - android:layout_alignTop="@+id/videocall_video_preview" - android:scaleType="center" - android:src="@drawable/quantum_ic_videocam_off_white_36" - android:visibility="gone" - android:importantForAccessibility="no" - tools:visibility="visible"/> - - <ImageView - android:id="@+id/videocall_video_preview_mute_overlay" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_alignBottom="@+id/videocall_video_preview" - android:layout_alignRight="@+id/videocall_video_preview" - android:background="@drawable/videocall_background_circle_white" - android:contentDescription="@string/incall_content_description_muted" - android:scaleType="center" - android:src="@drawable/quantum_ic_mic_off_black_24" - android:visibility="gone" - tools:visibility="visible"/> - <include layout="@layout/videocall_controls_land" android:layout_width="match_parent" @@ -108,4 +90,4 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true"/> -</RelativeLayout> +</FrameLayout> |