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

Merge "Fix layout height for suggestion tile." into pi-dev

Browse Source 
am: ec9606addb

Change-Id: I518af49e44a386ef6fcc7381f11ad0b635ba3ea7
This commit is contained in:
Doris Ling
2018-03-08 05:40:11 +00:00
committed by android-build-merger
parent 663ad81f07 ec9606addb
commit 7eef8156ea
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/suggestion_tile.xml
View File

@@ -29,7 +29,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="112dp"
android:layout_height="wrap_content"
android:minHeight="112dp"
android:paddingBottom="8dp"
android:orientation="vertical">

3
res/layout/suggestion_tile_with_button.xml
View File

@@ -29,7 +29,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_height="wrap_content"
android:minHeight="160dp"
android:orientation="vertical">
<RelativeLayout

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

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

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

@@ -231,12 +231,40 @@ public class SuggestionAdapterTest {
}
@Test
public void onBindViewHolder_shouldTintIcon() throws PendingIntent.CanceledException {
public void onBindViewHolder_iconNotTintable_shouldNotTintIcon()
throws PendingIntent.CanceledException {
final Icon icon = mock(Icon.class);
final Suggestion suggestion = new Suggestion.Builder("pkg1")
.setPendingIntent(mock(PendingIntent.class))
.setIcon(icon)
.build();
final List<Suggestion> suggestions = new ArrayList<>();
suggestions.add(suggestion);
mSuggestionAdapter = new SuggestionAdapter(mActivity, mSuggestionControllerMixin,
null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
mSuggestionAdapter.setSuggestions(suggestions);
mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
new FrameLayout(RuntimeEnvironment.application),
mSuggestionAdapter.getItemViewType(0));
IconCache cache = mock(IconCache.class);
final Drawable drawable = mock(Drawable.class);
when(cache.getIcon(icon)).thenReturn(drawable);
ReflectionHelpers.setField(mSuggestionAdapter, "mCache", cache);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
verify(drawable, never()).setTint(anyInt());
}
@Test
public void onBindViewHolder_iconTintable_shouldTintIcon()
throws PendingIntent.CanceledException {
final Icon icon = mock(Icon.class);
final int FLAG_ICON_TINTABLE = 1 << 1;
final Suggestion suggestion = new Suggestion.Builder("pkg1")
.setPendingIntent(mock(PendingIntent.class))
.setIcon(icon)
.setFlags(FLAG_ICON_TINTABLE)
.build();
final List<Suggestion> suggestions = new ArrayList<>();
suggestions.add(suggestion);