Merge "Screen record a11y fixes" into rvc-dev am: 11e6ef9438

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875671

Change-Id: I949eda0fd4ef5fb96432b4feffa758b522ebff82
This commit is contained in:
Beth Thibodeau
2020-06-16 14:14:47 +00:00
committed by Automerger Merge Worker

View File

@@ -20,6 +20,16 @@
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/rounded_bg_full"> android:background="@drawable/rounded_bg_full">
<!-- Scrollview is necessary to fit everything in landscape layout -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- Header --> <!-- Header -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -61,14 +71,17 @@
android:layout_marginRight="@dimen/screenrecord_dialog_padding"/> android:layout_marginRight="@dimen/screenrecord_dialog_padding"/>
<Spinner <Spinner
android:id="@+id/screen_recording_options" android:id="@+id/screen_recording_options"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_weight="1"
android:prompt="@string/screenrecord_audio_label"/> android:prompt="@string/screenrecord_audio_label"/>
<Switch <Switch
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_weight="1" android:layout_weight="0"
android:layout_gravity="end" android:layout_gravity="end"
android:contentDescription="@string/screenrecord_audio_label"
android:id="@+id/screenrecord_audio_switch"/> android:id="@+id/screenrecord_audio_switch"/>
</LinearLayout> </LinearLayout>
@@ -128,3 +141,5 @@
style="@android:style/Widget.DeviceDefault.Button.Colored"/> style="@android:style/Widget.DeviceDefault.Button.Colored"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
</LinearLayout>