Merge changes from topic "presubmit-am-85d24ca3e2624905a8fae68b1ad319bd" into tm-mainline-prod (cb732712) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_media_pause.xml

+91 −26

Original line number	Diff line number	Diff line
		@@ -14,13 +14,78 @@
		~ 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="16dp"
		android:viewportWidth="14"
		android:viewportHeight="16">
		<path
		android:pathData="M9.1818,15.6363H13.5455V0.3635H9.1818V15.6363ZM0.4546,15.6363H4.8182V0.3635H0.4546V15.6363Z"
		android:fillColor="#FFFFFF"
		android:fillType="evenOdd"/>
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<aapt:attr name="android:drawable">
		<vector android:height="24dp"
		android:width="24dp"
		android:viewportHeight="24"
		android:viewportWidth="24">
		<group android:name="_R_G">
		<group android:name="_R_G_L_1_G"
		android:translateX="12"
		android:translateY="12.125">
		<path android:name="_R_G_L_1_G_D_0_P_0"
		android:fillColor="#ffffff"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "/>
		</group>
		<group android:name="_R_G_L_0_G"
		android:translateX="12"
		android:translateY="12.125">
		<path android:name="_R_G_L_0_G_D_0_P_0"
		android:fillColor="#ffffff"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "/>
		</group>
		</group>
		<group android:name="time_group"/>
		</vector>
		</aapt:attr>
		<target android:name="_R_G_L_1_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="333"
		android:startOffset="0"
		android:valueFrom="M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
		android:valueTo="M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="_R_G_L_0_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="333"
		android:startOffset="0"
		android:valueFrom="M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "
		android:valueTo="M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="translateX"
		android:duration="517"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</aapt:attr>
		</target>
		</animated-vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_media_pause_container.xml

0 → 100644

+73 −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
		-->
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<aapt:attr name="android:drawable">
		<vector android:height="48dp"
		android:width="48dp"
		android:viewportHeight="48"
		android:viewportWidth="48">
		<group android:name="_R_G">
		<group android:name="_R_G_L_1_G"
		android:translateX="24"
		android:translateY="24"
		android:scaleX="0.5"
		android:scaleY="0.5"/>
		<group android:name="_R_G_L_0_G"
		android:translateX="24"
		android:translateY="24"
		android:scaleX="0.5"
		android:scaleY="0.5">
		<path android:name="_R_G_L_0_G_D_0_P_0"
		android:fillColor="#ffddb3"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M48 -16 C48,-16 48,16 48,16 C48,33.67 33.67,48 16,48 C16,48 -16,48 -16,48 C-33.67,48 -48,33.67 -48,16 C-48,16 -48,-16 -48,-16 C-48,-33.67 -33.67,-48 -16,-48 C-16,-48 16,-48 16,-48 C33.67,-48 48,-33.67 48,-16c "/>
		</group>
		</group>
		<group android:name="time_group"/>
		</vector>
		</aapt:attr>
		<target android:name="_R_G_L_0_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="500"
		android:startOffset="0"
		android:valueFrom="M48 -16 C48,-16 48,16 48,16 C48,33.67 33.67,48 16,48 C16,48 -16,48 -16,48 C-33.67,48 -48,33.67 -48,16 C-48,16 -48,-16 -48,-16 C-48,-33.67 -33.67,-48 -16,-48 C-16,-48 16,-48 16,-48 C33.67,-48 48,-33.67 48,-16c "
		android:valueTo="M48 0.25 C48,0.25 48,0 48,0 C47.75,26 31.25,48 0,48 C0,48 0,48 0,48 C-30,48 -48,25.75 -48,-0.25 C-48,-0.25 -48,-0.25 -48,-0.25 C-47.75,-23.5 -32.25,-47.75 0.5,-48 C0.5,-48 0.5,-48 0.5,-48 C28,-47.75 47.75,-29.75 48,0.25c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.526,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="translateX"
		android:duration="517"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</aapt:attr>
		</target>
		</animated-vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_media_play.xml

+91 −26

Original line number	Diff line number	Diff line
		@@ -14,13 +14,78 @@
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<aapt:attr name="android:drawable">
		<vector android:height="24dp"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M20,12L6,21V3L20,12ZM15.26,12L8.55,7.68V16.32L15.26,12Z"
		android:fillColor="#FFFFFF"
		android:fillType="evenOdd"/>
		android:viewportHeight="24"
		android:viewportWidth="24">
		<group android:name="_R_G">
		<group android:name="_R_G_L_1_G"
		android:translateX="12"
		android:translateY="12.125">
		<path android:name="_R_G_L_1_G_D_0_P_0"
		android:fillColor="#ffffff"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "/>
		</group>
		<group android:name="_R_G_L_0_G"
		android:translateX="12"
		android:translateY="12.125">
		<path android:name="_R_G_L_0_G_D_0_P_0"
		android:fillColor="#ffffff"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "/>
		</group>
		</group>
		<group android:name="time_group"/>
		</vector>
		</aapt:attr>
		<target android:name="_R_G_L_1_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="333"
		android:startOffset="0"
		android:valueFrom="M-6 7 C-6,7 -2,3.94 -2,3.94 C-2,3.94 -2,-4.37 -2,-4.37 C-2,-4.37 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
		android:valueTo="M-6 7 C-6,7 -2,7 -2,7 C-2,7 -2,-7 -2,-7 C-2,-7 -6,-7 -6,-7 C-6,-7 -6,7 -6,7c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="_R_G_L_0_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="333"
		android:startOffset="0"
		android:valueFrom="M-5.62 7 C-5.62,7 -4.75,7 -4.75,7 C-4.75,7 6,-0.12 6,-0.12 C6,-0.12 -4.44,-7 -4.44,-7 C-4.44,-7 -5.62,-7 -5.62,-7 C-5.62,-7 -5.62,7 -5.62,7c "
		android:valueTo="M2 7 C2,7 6,7 6,7 C6,7 6,-0.12 6,-0.12 C6,-0.12 6,-7 6,-7 C6,-7 2,-7 2,-7 C2,-7 2,7 2,7c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="translateX"
		android:duration="517"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</aapt:attr>
		</target>
		</animated-vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_media_play_container.xml

0 → 100644

+68 −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
		-->
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<aapt:attr name="android:drawable">
		<vector android:height="48dp"
		android:width="48dp"
		android:viewportHeight="48"
		android:viewportWidth="48">
		<group android:name="_R_G">
		<group android:name="_R_G_L_0_G"
		android:translateX="24"
		android:translateY="24"
		android:scaleX="0.5"
		android:scaleY="0.5">
		<path android:name="_R_G_L_0_G_D_0_P_0"
		android:fillColor="#ffddb3"
		android:fillAlpha="1"
		android:fillType="nonZero"
		android:pathData=" M48 0.25 C48,0.25 48,0 48,0 C47.75,26 31.25,48 0,48 C0,48 0,48 0,48 C-30,48 -48,25.75 -48,-0.25 C-48,-0.25 -48,-0.25 -48,-0.25 C-47.75,-23.5 -32.25,-47.75 0.5,-48 C0.5,-48 0.5,-48 0.5,-48 C28,-47.75 47.75,-29.75 48,0.25c "/>
		</group>
		</group>
		<group android:name="time_group"/>
		</vector>
		</aapt:attr>
		<target android:name="_R_G_L_0_G_D_0_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="pathData"
		android:duration="500"
		android:startOffset="0"
		android:valueFrom="M48 0.25 C48,0.25 48,0 48,0 C47.75,26 31.25,48 0,48 C0,48 0,48 0,48 C-30,48 -48,25.75 -48,-0.25 C-48,-0.25 -48,-0.25 -48,-0.25 C-47.75,-23.5 -32.25,-47.75 0.5,-48 C0.5,-48 0.5,-48 0.5,-48 C28,-47.75 47.75,-29.75 48,0.25c "
		android:valueTo="M48 -16 C48,-16 48,16 48,16 C48,33.67 33.67,48 16,48 C16,48 -16,48 -16,48 C-33.67,48 -48,33.67 -48,16 C-48,16 -48,-16 -48,-16 C-48,-33.67 -33.67,-48 -16,-48 C-16,-48 16,-48 16,-48 C33.67,-48 48,-33.67 48,-16c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.518,0 0,1 1.0,1.0"/>
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator android:propertyName="translateX"
		android:duration="517"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType"/>
		</set>
		</aapt:attr>
		</target>
		</animated-vector>
		No newline at end of file

packages/SystemUI/res/layout/media_session_view.xml

+8 −9

Original line number	Diff line number	Diff line
		@@ -145,8 +145,7 @@
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_padding"
		android:layout_marginEnd="@dimen/qs_media_padding"
		/>
		android:layout_marginEnd="@dimen/qs_media_padding" />

		<!-- See comment in media_session_collapsed.xml for how these barriers are used -->
		<androidx.constraintlayout.widget.Barrier
		@@ -184,7 +183,7 @@
		<!-- Button visibility will be controlled in code -->
		<ImageButton
		android:id="@+id/actionPrev"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="4dp"
		@@ -211,7 +210,7 @@

		<ImageButton
		android:id="@+id/actionNext"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="0dp"
		@@ -221,7 +220,7 @@

		<ImageButton
		android:id="@+id/action0"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_action_spacing"
		@@ -231,7 +230,7 @@

		<ImageButton
		android:id="@+id/action1"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_action_spacing"
		@@ -241,7 +240,7 @@

		<ImageButton
		android:id="@+id/action2"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_action_spacing"
		@@ -251,7 +250,7 @@

		<ImageButton
		android:id="@+id/action3"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_action_spacing"
		@@ -261,7 +260,7 @@

		<ImageButton
		android:id="@+id/action4"
		style="@style/MediaPlayer.SessionAction"
		style="@style/MediaPlayer.SessionAction.Secondary"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_marginStart="@dimen/qs_media_action_spacing"