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

Merge "Check icon tintable flag of the Suggestion."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-01 19:12:35 +00:00
committed by Android (Google) Code Review
parent 12fd732b55 0e96107ddc
commit 0186c9d223
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
View File

@@ -116,7 +116,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
mConfig.setCardLayout(holder, suggestionCount, position); mConfig.setCardLayout(holder, suggestionCount, position);
final Icon icon = suggestion.getIcon(); final Icon icon = suggestion.getIcon();
final Drawable drawable = mCache.getIcon(icon); final Drawable drawable = mCache.getIcon(icon);
if (drawable != null && TextUtils.equals(icon.getResPackage(), mContext.getPackageName())) { if ((suggestion.getFlags() & Suggestion.FLAG_ICON_TINTABLE) != 0) {
drawable.setTint(Utils.getColorAccent(mContext)); drawable.setTint(Utils.getColorAccent(mContext));
} }
holder.icon.setImageDrawable(drawable); holder.icon.setImageDrawable(drawable);

17
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
View File

@@ -215,11 +215,9 @@ public class SuggestionAdapterTest {
} }
@Test @Test
public void onBindViewHolder_differentPackage_shouldNotTintIcon() public void onBindViewHolder_iconNotTintable_shouldNotTintIcon()
throws PendingIntent.CanceledException { throws PendingIntent.CanceledException {
final Icon icon = mock(Icon.class); final Icon icon = mock(Icon.class);
when(icon.getResPackage()).thenReturn("pkg1");
when(mActivity.getPackageName()).thenReturn("pkg2");
final Suggestion suggestion = new Suggestion.Builder("pkg1") final Suggestion suggestion = new Suggestion.Builder("pkg1")
.setPendingIntent(mock(PendingIntent.class)) .setPendingIntent(mock(PendingIntent.class))
.setIcon(icon) .setIcon(icon)
@@ -243,15 +241,14 @@ public class SuggestionAdapterTest {
} }
@Test @Test
public void onBindViewHolder_samePackage_shouldTintIcon() public void onBindViewHolder_iconTintable_shouldTintIcon()
throws PendingIntent.CanceledException { throws PendingIntent.CanceledException {
final Icon icon = mock(Icon.class); final Icon icon = mock(Icon.class);
final String packageName = "pkg1"; final int FLAG_ICON_TINTABLE = 1 << 1;
when(icon.getResPackage()).thenReturn(packageName); final Suggestion suggestion = new Suggestion.Builder("pkg1")
when(mActivity.getPackageName()).thenReturn(packageName);
final Suggestion suggestion = new Suggestion.Builder(packageName)
.setPendingIntent(mock(PendingIntent.class)) .setPendingIntent(mock(PendingIntent.class))
.setIcon(icon) .setIcon(icon)
.setFlags(FLAG_ICON_TINTABLE)
.build(); .build();
final List<Suggestion> suggestions = new ArrayList<>(); final List<Suggestion> suggestions = new ArrayList<>();
suggestions.add(suggestion); suggestions.add(suggestion);