Merge "Update all forcestop icons in Settings." into main (2736ca15) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_settings_force_stop.xml

+4 −10

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2018 The Android Open Source Project
		Copyright (C) 2023 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.
		@@ -17,15 +17,9 @@
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		android:viewportWidth="960"
		android:viewportHeight="960">
		<path
		android:fillColor="#FF000000"
		android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>
		<path
		android:fillColor="#FF000000"
		android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>
		android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM330,840L120,630L120,330L330,120L630,120L840,330L840,630L630,840L330,840ZM364,760L596,760L760,596L760,364L596,200L364,200L200,364L200,596L364,760ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z" />
		</vector>

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.app.settings.SettingsEnums
		import android.content.pm.ApplicationInfo
		import android.os.UserManager
		import androidx.compose.material.icons.Icons
		import androidx.compose.material.icons.outlined.WarningAmber
		import androidx.compose.material.icons.outlined.Report
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.res.stringResource
		@@ -48,7 +48,7 @@ class AppForceStopButton(
		val dialogPresenter = confirmDialogPresenter()
		return ActionButton(
		text = context.getString(R.string.force_stop),
		imageVector = Icons.Outlined.WarningAmber,
		imageVector = Icons.Outlined.Report,
		enabled = isForceStopButtonEnable(app),
		) { onForceStopButtonClicked(app, dialogPresenter) }
		}