Merge "[Output Switcher] Update Volume control in Output Switcher" into tm-qpr-dev (951ceea5) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/media_output_dialog_seekbar_background.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,10 @@
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:id="@android:id/background">
		<shape>
		<corners android:radius="28dp" />
		<corners
		android:bottomRightRadius="28dp"
		android:topRightRadius="28dp"
		/>
		<solid android:color="@android:color/transparent" />
		<size
		android:height="64dp"/>

packages/SystemUI/res/drawable/media_output_icon_volume_off.xml

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2022 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="48dp"
		android:height="48dp"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="?attr/colorControlNormal"
		android:autoMirrored="true">
		<path
		android:fillColor="@color/media_dialog_item_main_content"
		android:pathData="M40.65,45.2 L34.05,38.6Q32.65,39.6 31.025,40.325Q29.4,41.05 27.65,41.45V38.35Q28.8,38 29.875,37.575Q30.95,37.15 31.9,36.45L23.65,28.15V40L13.65,30H5.65V18H13.45L2.45,7L4.6,4.85L42.8,43ZM38.85,33.6 L36.7,31.45Q37.7,29.75 38.175,27.85Q38.65,25.95 38.65,23.95Q38.65,18.8 35.65,14.725Q32.65,10.65 27.65,9.55V6.45Q33.85,7.85 37.75,12.725Q41.65,17.6 41.65,23.95Q41.65,26.5 40.95,28.95Q40.25,31.4 38.85,33.6ZM32.15,26.9 L27.65,22.4V15.9Q30,17 31.325,19.2Q32.65,21.4 32.65,24Q32.65,24.75 32.525,25.475Q32.4,26.2 32.15,26.9ZM23.65,18.4 L18.45,13.2 23.65,8ZM20.65,32.7V25.2L16.45,21H8.65V27H14.95ZM18.55,23.1Z"/>
		</vector>

packages/SystemUI/res/drawable/media_output_title_icon_area.xml

0 → 100644

+25 −0

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

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="rectangle">
		<corners
		android:bottomLeftRadius="28dp"
		android:topLeftRadius="28dp"
		android:bottomRightRadius="0dp"
		android:topRightRadius="0dp"/>
		<solid android:color="@color/media_dialog_item_background" />
		</shape>
		No newline at end of file

packages/SystemUI/res/layout/media_output_list_item_advanced.xml

0 → 100644

+158 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2022 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:id="@+id/device_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="64dp"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		android:layout_marginBottom="12dp">
		<FrameLayout
		android:id="@+id/item_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/media_output_item_background"
		android:layout_gravity="center_vertical\|start">
		<com.android.systemui.media.dialog.MediaOutputSeekbar
		android:id="@+id/volume_seekbar"
		android:splitTrack="false"
		android:visibility="gone"
		android:paddingStart="64dp"
		android:paddingEnd="0dp"
		android:background="@null"
		android:contentDescription="@string/media_output_dialog_accessibility_seekbar"
		android:progressDrawable="@drawable/media_output_dialog_seekbar_background"
		android:thumb="@null"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>
		</FrameLayout>

		<FrameLayout
		android:id="@+id/icon_area"
		android:layout_width="64dp"
		android:layout_height="64dp"
		android:background="@drawable/media_output_title_icon_area"
		android:layout_gravity="center_vertical\|start">
		<ImageView
		android:id="@+id/title_icon"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:animateLayoutChanges="true"
		android:layout_gravity="center"/>
		<TextView
		android:id="@+id/volume_value"
		android:animateLayoutChanges="true"
		android:layout_gravity="center"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
		android:textSize="16sp"
		android:visibility="gone"/>
		</FrameLayout>

		<TextView
		android:id="@+id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:layout_marginStart="72dp"
		android:layout_marginEnd="56dp"
		android:ellipsize="end"
		android:maxLines="1"
		android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
		android:textSize="16sp"/>

		<LinearLayout
		android:id="@+id/two_line_layout"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical\|start"
		android:layout_height="48dp"
		android:layout_marginEnd="56dp"
		android:layout_marginStart="72dp">
		<TextView
		android:id="@+id/two_line_title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
		android:textColor="@color/media_dialog_item_main_content"
		android:textSize="16sp"/>
		<TextView
		android:id="@+id/subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:maxLines="1"
		android:textColor="@color/media_dialog_item_main_content"
		android:textSize="14sp"
		android:fontFamily="@*android:string/config_bodyFontFamily"
		android:visibility="gone"/>
		</LinearLayout>

		<ProgressBar
		android:id="@+id/volume_indeterminate_progress"
		style="?android:attr/progressBarStyleSmallTitle"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginEnd="16dp"
		android:indeterminate="true"
		android:layout_gravity="end\|center"
		android:indeterminateOnly="true"
		android:visibility="gone"/>

		<ImageView
		android:id="@+id/media_output_item_status"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginEnd="16dp"
		android:indeterminate="true"
		android:layout_gravity="end\|center"
		android:indeterminateOnly="true"
		android:importantForAccessibility="no"
		android:visibility="gone"/>

		<LinearLayout
		android:id="@+id/end_action_area"
		android:visibility="gone"
		android:orientation="vertical"
		android:layout_width="48dp"
		android:layout_height="64dp"
		android:layout_gravity="end\|center"
		android:gravity="center_vertical">
		<CheckBox
		android:id="@+id/check_box"
		android:focusable="false"
		android:importantForAccessibility="no"
		android:layout_width="24dp"
		android:layout_height="24dp"
		android:layout_marginEnd="16dp"
		android:layout_gravity="end"
		android:button="@drawable/ic_circle_check_box"
		android:visibility="gone"
		/>

		</LinearLayout>
		</FrameLayout>
		</LinearLayout>
		No newline at end of file

packages/SystemUI/res/values/strings.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -2377,7 +2377,7 @@
		<!-- Controls menu, edit [CHAR_LIMIT=30] -->
		<string name="controls_menu_edit">Edit controls</string>

		<!-- Title for the media output group dialog with media related devices [CHAR LIMIT=50] -->
		<!-- Title for the media output dialog with media related devices [CHAR LIMIT=50] -->
		<string name="media_output_dialog_add_output">Add outputs</string>
		<!-- Title for the media output slice with group devices [CHAR LIMIT=50] -->
		<string name="media_output_dialog_group">Group</string>
		@@ -2401,6 +2401,8 @@
		<string name="media_output_dialog_accessibility_title">Available devices for audio output.</string>
		<!-- Accessibility text describing purpose of seekbar in media output dialog. [CHAR LIMIT=NONE] -->
		<string name="media_output_dialog_accessibility_seekbar">Volume</string>
		<!-- Summary for media output volume of a device in percentage [CHAR LIMIT=NONE] -->
		<string name="media_output_dialog_volume_percentage"><xliff:g id="percentage" example="10">%1$d</xliff:g>%%</string>

		<!-- Media Output Broadcast Dialog -->
		<!-- Title for Broadcast First Notify Dialog [CHAR LIMIT=60] -->