diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-04-04 06:38:55 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-04-04 06:38:55 -0700 |
| commit | 4dda4791465a5b41670ea64dfd78fccfb9bec89e (patch) | |
| tree | 1032ffb321fc3e1343f5a7a1c082c921343b8fbb /src/com/android/customization/model/grid/GridOption.java | |
| parent | 5b6c39e532730854324426ac543c03f0dae7a7b5 (diff) | |
| parent | 66234e84c45e4b09608b2a8c425a07fcd2ae913c (diff) | |
Merge 66234e84c45e4b09608b2a8c425a07fcd2ae913c on remote branch
Change-Id: I144db572a572f51717b4138557023225605031d0
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 |