Merge "Don't tint smart actions in shelf UI" into 24D1-dev (1e646eab) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayView.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -160,7 +160,8 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		R.drawable.ic_baseline_devices_24).loadDrawable(
		mContext),
		null,
		mContext.getString(R.string.clipboard_send_nearby_description)),
		mContext.getString(R.string.clipboard_send_nearby_description),
		true),
		new Function0<>() {
		@Override
		public Unit invoke() {
		@@ -175,7 +176,9 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		new ActionButtonAppearance(
		Icon.createWithResource(mContext,
		R.drawable.ic_screenshot_share).loadDrawable(mContext),
		null, mContext.getString(com.android.internal.R.string.share)),
		null,
		mContext.getString(com.android.internal.R.string.share),
		true),
		new Function0<>() {
		@Override
		public Unit invoke() {
		@@ -515,7 +518,7 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
		R.layout.shelf_action_chip, mActionContainer, false);
		mActionButtonViewBinder.bind(chip, ActionButtonViewModel.Companion.withNextId(
		new ActionButtonAppearance(action.getIcon().loadDrawable(mContext),
		action.getTitle(), action.getTitle()), new Function0<>() {
		action.getTitle(), action.getTitle(), false), new Function0<>() {
		@Override
		public Unit invoke() {
		try {

+4 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,10 @@ class ActionButtonViewBinder @Inject constructor() {
		// Note we never re-bind a view to a different ActionButtonViewModel, different view
		// models would remove/create separate views.
		drawable?.setIcon(viewModel.appearance.icon)
		iconView.setImageDrawable(viewModel.appearance.icon)
		if (!viewModel.appearance.tint) {
		iconView.setImageTintList(null)
		}
		textView.text = viewModel.appearance.label

		viewModel.appearance.customBackground?.also {

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,5 +25,6 @@ constructor(
		val icon: Drawable?,
		val label: CharSequence?,
		val description: CharSequence,
		val tint: Boolean = true,
		val customBackground: Drawable? = null,
		)