diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2022-05-01 21:55:20 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-05-01 21:55:20 +0800 |
| commit | 2ea03486c86a7023830b31edfb87ee41994e59e0 (patch) | |
| tree | 9792282834a6dd1e678dcfb12a2c8cc9b9d13bb7 /src/com/android/customization/model/grid/GridOption.java | |
| parent | 1e4602e4f6b26df738ec65555489c22e5e15752b (diff) | |
| parent | 4dda4791465a5b41670ea64dfd78fccfb9bec89e (diff) | |
Merge tag 'LA.QSSI.12.0.r1-06800-qssi.0' into sugisawa-mr1HEADsugisawa-mr1
"LA.QSSI.12.0.r1-06800-qssi.0"
Change-Id: Ib7b70941f6b07e137eed7d3318e2744f91e8002b
Diffstat (limited to 'src/com/android/customization/model/grid/GridOption.java')
| -rw-r--r-- | src/com/android/customization/model/grid/GridOption.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/customization/model/grid/GridOption.java b/src/com/android/customization/model/grid/GridOption.java index 16a5eb01..19c5d4f1 100644 --- a/src/com/android/customization/model/grid/GridOption.java +++ b/src/com/android/customization/model/grid/GridOption.java @@ -93,11 +93,18 @@ public class GridOption implements CustomizationOption<GridOption>, Parcelable { Context context = view.getContext(); int colorFilter = ResourceUtils.getColorAttr(context, - view.isActivated() ? android.R.attr.textColorPrimary : - android.R.attr.textColorTertiary); + view.isActivated() + ? (mIsCurrent + ? android.R.attr.textColorPrimary + : android.R.attr.textColorPrimaryInverse) + : android.R.attr.textColorTertiary); mTileDrawable.setColorFilter(colorFilter, Mode.SRC_ATOP); ((ImageView) view.findViewById(R.id.grid_option_thumbnail)) .setImageDrawable(mTileDrawable); + + int backgroundResource = view.isActivated() && !mIsCurrent + ? R.drawable.option_border_new_selection : R.drawable.option_border; + view.findViewById(R.id.option_tile).setBackgroundResource(backgroundResource); } @Override |