diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-08 00:54:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 00:54:45 +0000 |
| commit | 274b6d320edb3c33e7b3a95c43a811829486a777 (patch) | |
| tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/incallui/video/impl/res/layout | |
| parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) | |
| parent | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/158012278.
am: 91ce7d2a47
Change-Id: I1744a8bfca09eae5e9c0d7aac122515eca75bb8b
Diffstat (limited to 'java/com/android/incallui/video/impl/res/layout')
| -rw-r--r-- | java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml index c67246675..1a2bc2429 100644 --- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml +++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout 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" @@ -32,7 +32,7 @@ android:id="@+id/videocall_remote_video_off" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_centerInParent="true" android:accessibilityTraversalBefore="@+id/videocall_speaker_button" android:drawablePadding="8dp" android:drawableTop="@drawable/quantum_ic_videocam_off_white_36" @@ -71,20 +71,23 @@ 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> + <ImageView + android:id="@+id/videocall_video_preview_mute_overlay" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_alignBottom="@id/videocall_preview_root" + android:layout_alignEnd="@id/videocall_preview_root" + android:layout_marginBottom="-8dp" + android:layout_marginEnd="-8dp" + 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"/> + <View android:id="@+id/videocall_green_screen_background" android:layout_width="match_parent" @@ -102,4 +105,4 @@ android:layout_height="wrap_content" android:layout_gravity="top"/> -</FrameLayout> +</RelativeLayout> |