Merge "Add screen recording parameters UI" into main (01054e42) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_mic_expressive.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2025 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="14dp"
		android:height="19dp"
		android:viewportHeight="19"
		android:viewportWidth="14">
		<path
		android:fillColor="#ffffff"
		android:pathData="M7,12C6.167,12 5.458,11.708 4.875,11.125C4.292,10.542 4,9.833 4,9V3C4,2.167 4.292,1.458 4.875,0.875C5.458,0.292 6.167,-0 7,-0C7.833,-0 8.542,0.292 9.125,0.875C9.708,1.458 10,2.167 10,3V9C10,9.833 9.708,10.542 9.125,11.125C8.542,11.708 7.833,12 7,12ZM6,18V15.925C4.467,15.708 3.15,15.058 2.05,13.975C0.967,12.892 0.308,11.575 0.075,10.025C0.042,9.742 0.117,9.5 0.3,9.3C0.483,9.1 0.717,9 1,9C1.283,9 1.517,9.1 1.7,9.3C1.9,9.483 2.033,9.717 2.1,10C2.333,11.167 2.908,12.125 3.825,12.875C4.758,13.625 5.817,14 7,14C8.2,14 9.258,13.625 10.175,12.875C11.092,12.108 11.667,11.15 11.9,10C11.967,9.717 12.092,9.483 12.275,9.3C12.475,9.1 12.717,9 13,9C13.283,9 13.517,9.1 13.7,9.3C13.883,9.5 13.958,9.742 13.925,10.025C13.692,11.542 13.033,12.85 11.95,13.95C10.867,15.05 9.55,15.708 8,15.925V18C8,18.283 7.9,18.525 7.7,18.725C7.517,18.908 7.283,19 7,19C6.717,19 6.475,18.908 6.275,18.725C6.092,18.525 6,18.283 6,18ZM7,10C7.283,10 7.517,9.908 7.7,9.725C7.9,9.525 8,9.283 8,9V3C8,2.717 7.9,2.483 7.7,2.3C7.517,2.1 7.283,2 7,2C6.717,2 6.475,2.1 6.275,2.3C6.092,2.483 6,2.717 6,3V9C6,9.283 6.092,9.525 6.275,9.725C6.475,9.908 6.717,10 7,10Z" />
		</vector>

packages/SystemUI/res/drawable/ic_phone_expressive.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2025 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="15dp"
		android:height="22dp"
		android:viewportHeight="22"
		android:viewportWidth="15">
		<path
		android:fillColor="#ffffff"
		android:pathData="M2,22C1.45,22 0.975,21.808 0.575,21.425C0.192,21.025 0,20.55 0,20V2C0,1.45 0.192,0.983 0.575,0.6C0.975,0.2 1.45,-0 2,-0H12C12.55,-0 13.017,0.2 13.4,0.6C13.8,0.983 14,1.45 14,2V5.1C14.3,5.217 14.542,5.4 14.725,5.65C14.908,5.9 15,6.183 15,6.5V8.5C15,8.817 14.908,9.1 14.725,9.35C14.542,9.6 14.3,9.783 14,9.9V20C14,20.55 13.8,21.025 13.4,21.425C13.017,21.808 12.55,22 12,22H2ZM2,20H12V2H2V20ZM2,20V2V20ZM7,5C7.283,5 7.517,4.908 7.7,4.725C7.9,4.525 8,4.283 8,4C8,3.717 7.9,3.483 7.7,3.3C7.517,3.1 7.283,3 7,3C6.717,3 6.475,3.1 6.275,3.3C6.092,3.483 6,3.717 6,4C6,4.283 6.092,4.525 6.275,4.725C6.475,4.908 6.717,5 7,5Z" />
		</vector>

packages/SystemUI/res/drawable/ic_touch_expressive.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2025 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="?attr/colorControlNormal"
		android:viewportHeight="24"
		android:viewportWidth="24">
		<path
		android:fillColor="#ffffff"
		android:pathData="M8.475,21C8.008,21 7.567,20.9 7.15,20.7C6.75,20.5 6.408,20.217 6.125,19.85L1.1,13.475C0.967,13.325 0.908,13.15 0.925,12.95C0.942,12.733 1.017,12.558 1.15,12.425C1.483,12.075 1.883,11.867 2.35,11.8C2.817,11.733 3.25,11.825 3.65,12.075L5.5,13.2V5C5.5,4.717 5.592,4.483 5.775,4.3C5.975,4.1 6.217,4 6.5,4C6.783,4 7.025,4.1 7.225,4.3C7.425,4.483 7.525,4.717 7.525,5V15C7.525,15.383 7.35,15.675 7,15.875C6.667,16.058 6.333,16.05 6,15.85L5.1,15.3L7.7,18.625C7.8,18.742 7.917,18.833 8.05,18.9C8.183,18.967 8.325,19 8.475,19H14C14.55,19 15.017,18.808 15.4,18.425C15.8,18.025 16,17.55 16,17V13C16,12.717 15.9,12.483 15.7,12.3C15.517,12.1 15.283,12 15,12H10.525C10.242,12 10,11.908 9.8,11.725C9.617,11.525 9.525,11.283 9.525,11C9.525,10.717 9.617,10.483 9.8,10.3C10,10.1 10.242,10 10.525,10H15C15.833,10 16.542,10.292 17.125,10.875C17.708,11.458 18,12.167 18,13V17C18,18.1 17.608,19.042 16.825,19.825C16.042,20.608 15.1,21 14,21H8.475ZM9.975,8C9.692,8 9.45,7.908 9.25,7.725C9.067,7.525 8.975,7.283 8.975,7C8.975,6.967 9.017,6.8 9.1,6.5C9.233,6.267 9.333,6.033 9.4,5.8C9.467,5.55 9.5,5.283 9.5,5C9.5,4.167 9.208,3.458 8.625,2.875C8.042,2.292 7.333,2 6.5,2C5.667,2 4.958,2.292 4.375,2.875C3.792,3.458 3.5,4.167 3.5,5C3.5,5.283 3.533,5.55 3.6,5.8C3.667,6.033 3.767,6.267 3.9,6.5C3.95,6.583 3.983,6.667 4,6.75C4.017,6.833 4.025,6.917 4.025,7C4.025,7.283 3.933,7.525 3.75,7.725C3.567,7.908 3.333,8 3.05,8C2.867,8 2.692,7.95 2.525,7.85C2.375,7.75 2.258,7.625 2.175,7.475C1.958,7.108 1.792,6.717 1.675,6.3C1.558,5.883 1.5,5.45 1.5,5C1.5,3.617 1.983,2.442 2.95,1.475C3.933,0.492 5.117,-0 6.5,-0C7.883,-0 9.058,0.492 10.025,1.475C11.008,2.442 11.5,3.617 11.5,5C11.5,5.45 11.442,5.883 11.325,6.3C11.208,6.717 11.042,7.108 10.825,7.475C10.742,7.625 10.625,7.75 10.475,7.85C10.325,7.95 10.158,8 9.975,8Z"></path>
		</vector>

packages/SystemUI/res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -348,6 +348,12 @@
		<!-- Button to stop a screen recording [CHAR LIMIT=35] -->
		<string name="screenrecord_stop_dialog_button">Stop recording</string>

		<!-- Screen recording should record device audio setting [CHAR LIMIT=35] -->
		<string name="screen_record_record_device_audio_label">Record device audio</string>
		<!-- Screen recording should record microphone setting [CHAR LIMIT=35] -->
		<string name="screen_record_record_microphone_label">Record microphone</string>
		<!-- Screen recording should show touches setting [CHAR LIMIT=35] -->
		<string name="screen_record_should_show_touches_label">Show touches</string>
		<!-- Header for the carousel to choose an app for screen recording. [CHAR LIMIT=50] -->
		<string name="screen_record_capture_target_choose_app">Choose an app to record</string>

packages/SystemUI/res/values/styles.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -1022,9 +1022,12 @@
		<item name="android:thumb">@drawable/settingslib_switch_thumb</item>
		</style>

		<style name="ScreenCapture" parent="Theme.AppCompat.NoActionBar">
		<style name="ScreenCapture" parent="@style/Theme.AppCompat.NoActionBar">
		<item name="android:windowNoTitle">true</item>
		<item name="android:windowIsTranslucent">true</item>
		<item name="android:windowBackground">@android:color/transparent</item>
		<item name="android:backgroundDimEnabled">false</item>
		<item name="android:windowCloseOnTouchOutside">false</item>
		</style>

		<style name="TextAppearance.ScreenRecord" />