Add background color to suggestion/condition view.

- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual

res/layout/suggestion_condition_container.xml

@@ -35,6 +35,7 @@
             android:id="@+id/data"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/material_grey_300"
             android:scrollbars="none"/>
 
     </android.support.v7.widget.CardView>

src/com/android/settings/dashboard/conditional/ConditionAdapter.java

@@ -70,7 +70,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
 
         @Override
         public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-            return viewHolder.getItemViewType() == R.layout.condition_tile_new_ui
+            return viewHolder.getItemViewType() == R.layout.condition_tile
                     ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
         }
 
@@ -121,7 +121,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
 
     @Override
     public int getItemViewType(int position) {
-        return R.layout.condition_tile_new_ui;
+        return R.layout.condition_tile;
     }
 
     @Override

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

@@ -115,8 +115,8 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
     public int getItemViewType(int position) {
         Tile suggestion = getSuggestion(position);
         return suggestion.remoteViews != null
-                ? R.layout.suggestion_tile_card
+                ? R.layout.suggestion_tile_remote_container
-                : R.layout.suggestion_tile_new_ui;
+                : R.layout.suggestion_tile;
     }
 
     @Override

src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java

@@ -66,8 +66,8 @@ public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback
     @Override
     public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
         final int layoutId = viewHolder.getItemViewType();
-        if (layoutId == R.layout.suggestion_tile_new_ui
+        if (layoutId == R.layout.suggestion_tile
-                || layoutId == R.layout.suggestion_tile_card) {
+                || layoutId == R.layout.suggestion_tile_remote_container) {
             // Only return swipe direction for suggestion tiles. All other types are not swipeable.
             return super.getSwipeDirs(recyclerView, viewHolder);
         }

tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java

@@ -99,13 +99,13 @@ public class ConditionAdapterTest {
     public void getItemViewType_shouldReturnConditionTile() {
         mConditionAdapter = new ConditionAdapter(
             mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile_new_ui);
+        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile);
     }
 
     @Test
     public void onBindViewHolder_shouldSetListener() {
         final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+            R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
             new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(
@@ -119,7 +119,7 @@ public class ConditionAdapterTest {
     @Test
     public void viewClick_shouldInvokeConditionPrimaryClick() {
         final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+            R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
             new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(
@@ -135,7 +135,7 @@ public class ConditionAdapterTest {
     public void onSwiped_nullCondition_shouldNotCrash() {
         final RecyclerView recyclerView = new RecyclerView(mContext);
         final View view = LayoutInflater.from(mContext).inflate(
-                R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+                R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
                 new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(

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

@@ -105,13 +105,13 @@ public class SuggestionAdapterTest {
     public void getItemViewType_shouldReturnSuggestionTile() {
         mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemViewType(0))
-            .isEqualTo(R.layout.suggestion_tile_new_ui);
+            .isEqualTo(R.layout.suggestion_tile);
     }
 
     @Test
     public void onBindViewHolder_shouldSetListener() {
         final View view = spy(LayoutInflater.from(mContext).inflate(
-            R.layout.suggestion_tile_new_ui, new LinearLayout(mContext), true));
+            R.layout.suggestion_tile, new LinearLayout(mContext), true));
         mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
         mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
 

tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java

@@ -80,7 +80,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isSuggestionTile_shouldReturnDirection() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_new_ui);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
@@ -89,7 +89,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_card);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
@@ -98,7 +98,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isNotSuggestionTile_shouldReturn0() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile_new_ui);
+        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(0);