PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a am: 86231b9ec5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: Iadceabdd679c5a66b5f46d9a517b839e98b2dc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Silva
2023-05-04 16:10:33 +00:00
committed by Automerger Merge Worker
parent 2d3c8e3c37 86231b9ec5
commit 100c550fda
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/dream_preference_layout.xml
View File

@@ -79,6 +79,7 @@
android:textSize="@dimen/dream_item_title_text_size" android:textSize="@dimen/dream_item_title_text_size"
android:textColor="@color/dream_card_text_color_state_list" android:textColor="@color/dream_card_text_color_state_list"
android:drawablePadding="@dimen/dream_item_icon_padding" android:drawablePadding="@dimen/dream_item_icon_padding"
android:drawableTint="@color/dream_card_icon_color_state_list"
app:layout_constraintTop_toBottomOf="@+id/preview" app:layout_constraintTop_toBottomOf="@+id/preview"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

5
src/com/android/settings/dream/DreamAdapter.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.dream;
import android.annotation.LayoutRes; import android.annotation.LayoutRes;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.VectorDrawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -86,10 +85,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
final Drawable icon = item.isActive() final Drawable icon = item.isActive()
? mContext.getDrawable(R.drawable.ic_dream_check_circle) ? mContext.getDrawable(R.drawable.ic_dream_check_circle)
: item.getIcon().mutate(); : item.getIcon().mutate();
if (icon instanceof VectorDrawable) {
icon.setTintList(
mContext.getColorStateList(R.color.dream_card_icon_color_state_list));
}
final int iconSize = mContext.getResources().getDimensionPixelSize( final int iconSize = mContext.getResources().getDimensionPixelSize(
R.dimen.dream_item_icon_size); R.dimen.dream_item_icon_size);
icon.setBounds(0, 0, iconSize, iconSize); icon.setBounds(0, 0, iconSize, iconSize);