Merge "Add an explicit media indicator icon to SysUI media controls" (b8762a6c) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_media_explicit_indicator.xml

0 → 100644

+26 −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
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="13dp"
		android:height="13dp"
		android:viewportWidth="48"
		android:viewportHeight="48"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M18.3,34H29.65V31H21.3V25.7H29.65V22.7H21.3V17.35H29.65V14.35H18.3ZM9,42Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6H39Q40.2,6 41.1,6.9Q42,7.8 42,9V39Q42,40.2 41.1,41.1Q40.2,42 39,42ZM9,39H39Q39,39 39,39Q39,39 39,39V9Q39,9 39,9Q39,9 39,9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39ZM9,9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39Q9,39 9,39Q9,39 9,39V9Q9,9 9,9Q9,9 9,9Z"/>
		</vector>

+8 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,14 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		<!-- Explicit Indicator -->
		<com.android.internal.widget.CachingIconView
		android:id="@+id/media_explicit_indicator"
		android:layout_width="@dimen/qs_media_explicit_indicator_icon_size"
		android:layout_height="@dimen/qs_media_explicit_indicator_icon_size"
		android:src="@drawable/ic_media_explicit_indicator"
		/>

		<!-- Artist name -->
		<TextView
		android:id="@+id/header_artist"

+1 −0

Original line number	Diff line number	Diff line
		@@ -1050,6 +1050,7 @@
		<dimen name="qs_media_disabled_seekbar_height">1dp</dimen>
		<dimen name="qs_media_enabled_seekbar_height">2dp</dimen>
		<dimen name="qs_media_app_icon_size">24dp</dimen>
		<dimen name="qs_media_explicit_indicator_icon_size">13dp</dimen>

		<dimen name="qs_media_session_enabled_seekbar_vertical_padding">15dp</dimen>
		<dimen name="qs_media_session_disabled_seekbar_vertical_padding">16dp</dimen>

+17 −3

Original line number	Diff line number	Diff line
		@@ -66,6 +66,21 @@
		app:layout_constraintTop_toBottomOf="@id/icon"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintHorizontal_bias="0" />

		<Constraint
		android:id="@+id/media_explicit_indicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/qs_media_info_spacing"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginTop="0dp"
		app:layout_constraintStart_toStartOf="@id/header_title"
		app:layout_constraintEnd_toStartOf="@id/header_artist"
		app:layout_constraintTop_toTopOf="@id/header_artist"
		app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"
		app:layout_constraintHorizontal_bias="0"
		app:layout_constraintHorizontal_chainStyle="packed" />

		<Constraint
		android:id="@+id/header_artist"
		android:layout_width="wrap_content"
		@@ -75,9 +90,8 @@
		app:layout_constraintEnd_toStartOf="@id/action_button_guideline"
		app:layout_constrainedWidth="true"
		app:layout_constraintTop_toBottomOf="@id/header_title"
		app:layout_constraintStart_toStartOf="@id/header_title"
		app:layout_constraintVertical_bias="0"
		app:layout_constraintHorizontal_bias="0" />
		app:layout_constraintStart_toEndOf="@id/media_explicit_indicator"
		app:layout_constraintVertical_bias="0" />

		<Constraint
		android:id="@+id/actionPlayPause"

+17 −3

Original line number	Diff line number	Diff line
		@@ -58,6 +58,21 @@
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintBottom_toTopOf="@id/header_artist"
		app:layout_constraintHorizontal_bias="0" />

		<Constraint
		android:id="@+id/media_explicit_indicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="@dimen/qs_media_info_spacing"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginTop="0dp"
		app:layout_constraintStart_toStartOf="@id/header_title"
		app:layout_constraintEnd_toStartOf="@id/header_artist"
		app:layout_constraintTop_toTopOf="@id/header_artist"
		app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"
		app:layout_constraintHorizontal_bias="0"
		app:layout_constraintHorizontal_chainStyle="packed"/>

		<Constraint
		android:id="@+id/header_artist"
		android:layout_width="wrap_content"
		@@ -67,10 +82,9 @@
		android:layout_marginTop="0dp"
		app:layout_constrainedWidth="true"
		app:layout_constraintEnd_toStartOf="@id/actionPlayPause"
		app:layout_constraintStart_toStartOf="@id/header_title"
		app:layout_constraintStart_toEndOf="@id/media_explicit_indicator"
		app:layout_constraintBottom_toTopOf="@id/media_action_barrier_top"
		app:layout_constraintVertical_bias="0"
		app:layout_constraintHorizontal_bias="0" />
		app:layout_constraintVertical_bias="0" />

		<Constraint
		android:id="@+id/actionPlayPause"