Merge "Use normal vector drawable for connecting button" into main (c114ac95) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_media_connecting_button_container.xml

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ 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="88dp"
		android:height="56dp"
		android:viewportHeight="56"
		android:viewportWidth="88">
		<group android:name="_R_G">
		<group
		android:name="_R_G_L_1_G"
		android:scaleX="1.05905"
		android:scaleY="1.0972"
		android:translateX="43.528999999999996"
		android:translateY="27.898" />
		<group
		android:name="_R_G_L_0_G"
		android:pivotX="0.493"
		android:pivotY="0.124"
		android:scaleX="1.05905"
		android:scaleY="1.0972"
		android:translateX="43.528999999999996"
		android:translateY="27.898">
		<path
		android:name="_R_G_L_0_G_D_0_P_0"
		android:fillAlpha="1"
		android:fillColor="#3d90ff"
		android:fillType="nonZero"
		android:pathData=" M34.49 -5.75 C34.49,-5.75 34.49,6 34.49,6 C34.49,14.84 27.32,22 18.49,22 C18.49,22 -17.5,22 -17.5,22 C-26.34,22 -33.5,14.84 -33.5,6 C-33.5,6 -33.5,-5.75 -33.5,-5.75 C-33.5,-14.59 -26.34,-21.75 -17.5,-21.75 C-17.5,-21.75 18.49,-21.75 18.49,-21.75 C27.32,-21.75 34.49,-14.59 34.49,-5.75c " />
		</group>
		</group>
		</vector>
		No newline at end of file

packages/SystemUI/res/drawable/ic_media_connecting_status_container.xml

deleted100644 → 0

+0 −199

File deleted.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/Media3ActionFactory.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ constructor(
		null, // no action to perform when clicked
		context.getString(R.string.controls_media_button_connecting),
		if (Flags.mediaControlsUiUpdate()) {
		context.getDrawable(R.drawable.ic_media_connecting_status_container)
		context.getDrawable(R.drawable.ic_media_connecting_button_container)
		} else {
		context.getDrawable(R.drawable.ic_media_connecting_container)
		},

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaActions.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ fun createActionsFromState(
		null, // no action to perform when clicked
		context.getString(R.string.controls_media_button_connecting),
		if (Flags.mediaControlsUiUpdate()) {
		context.getDrawable(R.drawable.ic_media_connecting_status_container)
		context.getDrawable(R.drawable.ic_media_connecting_button_container)
		} else {
		context.getDrawable(R.drawable.ic_media_connecting_container)
		},