Merge "Screen recording sound options" into rvc-dev am: 54fda22191 (5014f1e5) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/screen_record_dialog.xml

+8 −20

Original line number	Diff line number	Diff line
		@@ -59,29 +59,16 @@
		android:layout_gravity="center"
		android:layout_weight="0"
		android:layout_marginRight="@dimen/screenrecord_dialog_padding"/>
		<LinearLayout
		<Spinner
		android:id="@+id/screen_recording_options"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_weight="1">
		<TextView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:text="@string/screenrecord_audio_label"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"/>
		<TextView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/audio_type"
		android:text="@string/screenrecord_mic_label"
		android:textAppearance="?android:attr/textAppearanceSmall"/>
		</LinearLayout>
		android:layout_height="48dp"
		android:prompt="@string/screenrecord_audio_label"/>
		<Switch
		android:layout_width="wrap_content"
		android:layout_height="48dp"
		android:layout_weight="0"
		android:layout_weight="1"
		android:layout_gravity="end"
		android:id="@+id/screenrecord_audio_switch"/>
		</LinearLayout>

		@@ -102,7 +89,8 @@
		android:id="@+id/screenrecord_taps_switch"
		android:text="@string/screenrecord_taps_label"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"/>
		android:textAppearance="?android:attr/textAppearanceSmall"/>

		</LinearLayout>
		</LinearLayout>

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:orientation="vertical"
		android:padding="10dp"
		android:layout_weight="1">
		<TextView
		android:id="@+id/screen_recording_dialog_source_text"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorPrimary"/>
		<TextView
		android:id="@+id/screen_recording_dialog_source_description"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"/>
		</LinearLayout>
		No newline at end of file

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2020 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.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="48dp"
		android:orientation="vertical"
		android:layout_weight="1">
		<TextView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:text="@string/screenrecord_audio_label"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorPrimary"/>
		<TextView
		android:id="@+id/screen_recording_dialog_source_text"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:textColor="?android:attr/textColorSecondary"
		android:textAppearance="?android:attr/textAppearanceSmall"/>
		</LinearLayout>
		No newline at end of file

+5 −0

Original line number	Diff line number	Diff line
		@@ -144,5 +144,10 @@

		<!-- NotificationPanelView -->
		<item type="id" name="notification_panel" />

		<!-- Screen Recording -->
		<item type="id" name="screen_recording_options" />
		<item type="id" name="screen_recording_dialog_source_text" />
		<item type="id" name="screen_recording_dialog_source_description" />
		</resources>

+2 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,8 @@

		<!-- Notification title displayed for screen recording [CHAR LIMIT=50]-->
		<string name="screenrecord_name">Screen Recorder</string>
		<!-- Processing screen recoding video in the background [CHAR LIMIT=30]-->
		<string name="screenrecord_background_processing_label">Processing screen recording</string>
		<!-- Description of the screen recording notification channel [CHAR LIMIT=NONE]-->
		<string name="screenrecord_channel_description">Ongoing notification for a screen record session</string>
		<!-- Title for the screen prompting the user to begin recording their screen [CHAR LIMIT=NONE]-->