Combine settings suggestion and condition.
- Add a flag in dashboard feature provider to specify whether to use the combined UI for suggestions and conditions. - Move Conditions below Suggestions. - Add dashboard entity for condition and suggestion container, and wrap the condition and suggestion list inside the container. The container itself will be a single dashboard item, and within it will be the list of suggestion or condition. - Add suggestion/condition header that will show the combined info for the conditions and suggestion data, and have the expand button to control expanding both the suggestion and condition list. - Change the individual condition card to be always expanded, and remove the logic to collapse/expand individual condition card. - Remove the divider between the action button and condition detail within each condition card. - Add suggestion/condition footer for collapsing the whole suggestion and condition list. Bug: 37645754 Test: make RunSettingsRoboTests Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
This commit is contained in:
@@ -163,14 +163,6 @@ public class DashboardAdapterTest {
|
||||
assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
|
||||
mDashboardAdapter.onExpandClick(mView);
|
||||
assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
|
||||
mDashboardAdapter.setConditions(null);
|
||||
assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuggestionsLogs_NotExpanded() {
|
||||
setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
|
||||
|
Reference in New Issue
Block a user