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

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_new_ui;
+                ? R.layout.suggestion_tile_remote_container
+                : 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
-                || layoutId == R.layout.suggestion_tile_card) {
+        if (layoutId == R.layout.suggestion_tile
+                || 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);
         }