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

Merge "Create a new list when building suggestion data." into pi-dev

Browse Source
This commit is contained in:
Doris Ling
2018-03-06 21:09:24 +00:00
committed by Android (Google) Code Review
parent 60e108788c 05811609c7
commit b76682afcb
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -155,8 +155,8 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
// remain as the dashboard item. Need to refresh the dashboard list.
setSuggestions(null);
} else {
mSuggestionAdapter.removeSuggestion(suggestion);
notifyItemChanged(0, null);
list.remove(suggestion);
setSuggestions(list);
}
}

6
src/com/android/settings/dashboard/DashboardData.java
View File

@@ -246,7 +246,11 @@ public class DashboardData {
if (suggestions.size() <= MAX_SUGGESTION_COUNT) {
return suggestions;
}
return suggestions.subList(0, MAX_SUGGESTION_COUNT);
final List<Suggestion> suggestionsToShow = new ArrayList<>(MAX_SUGGESTION_COUNT);
for (int i = 0; i < MAX_SUGGESTION_COUNT; i++) {
suggestionsToShow.add(suggestions.get(i));
}
return suggestionsToShow;
}
/**

3
tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
View File

@@ -124,10 +124,9 @@ public class DashboardAdapterTest {
final Suggestion suggestionToRemove = suggestions.get(1);
adapter.onSuggestionClosed(suggestionToRemove);
assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
assertThat(suggestions.size()).isEqualTo(2);
assertThat(suggestions.contains(suggestionToRemove)).isFalse();
verify(adapter, never()).notifyDashboardDataChanged(any());
verify(adapter).notifyDashboardDataChanged(any());
}
@Test