Merge "Update QS footer actions icons" into main (c708eb47) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/qs/footer/ui/compose/FooterActions.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ private fun RowScope.ForegroundServicesButton(
		val model = model() ?: return
		if (model.displayText) {
		TextButton(
		Icon.Resource(R.drawable.ic_info_outline, contentDescription = null),
		Icon.Resource(R.drawable.ic_qs_footer_info, contentDescription = null),
		model.text,
		showNewDot = model.hasNewChanges,
		onClick = model.onClick,

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class QSSecurityFooterTest extends SysuiTestCase {
		private static final String PARENTAL_CONTROLS_LABEL = "Parental Control App";
		private static final ComponentName DEVICE_OWNER_COMPONENT =
		new ComponentName("TestDPC", "Test");
		private static final int DEFAULT_ICON_ID = R.drawable.ic_info_outline;
		private static final int DEFAULT_ICON_ID = R.drawable.ic_qs_footer_info;

		private QSSecurityFooterUtils mFooterUtils;
		@Mock

+2 −2

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ class FooterActionsViewModelTest : SysuiTestCase() {
		assertThat(settings.icon)
		.isEqualTo(
		Icon.Resource(
		R.drawable.ic_settings,
		R.drawable.ic_qs_footer_settings,
		ContentDescription.Resource(R.string.accessibility_quick_settings_settings),
		)
		)
		@@ -132,7 +132,7 @@ class FooterActionsViewModelTest : SysuiTestCase() {
		assertThat(checkNotNull(power).icon)
		.isEqualTo(
		Icon.Resource(
		android.R.drawable.ic_lock_power_off,
		R.drawable.ic_qs_footer_power,
		ContentDescription.Resource(R.string.accessibility_quick_settings_power_menu),
		)
		)

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
		</vector>

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2017 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="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="#FF000000"
		android:pathData="M11,2h2v10h-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M18.37,5.64l-1.41,1.41c2.73,2.73 2.72,7.16 -0.01,9.89c-2.73,2.73 -7.17,2.73 -9.89,0.01c-2.73,-2.73 -2.74,-7.18 -0.01,-9.91L5.64,5.64c-3.51,3.51 -3.51,9.21 0.01,12.73c3.51,3.51 9.21,3.51 12.72,-0.01C21.88,14.85 21.88,9.16 18.37,5.64z"/>
		</vector>