Remove ContentStyle support check

Fixes: 128333911
Test: Manual
Change-Id: Ie406c48ac36eda171446e0f8f5226ce42f83dcc6

2 files changed, 3 insertions, 10 deletions

diff --git a/src/com/android/car/media/BrowseFragment.java b/src/com/android/car/media/BrowseFragment.java
index 309186f..0dc7f3c 100644
--- a/src/com/android/car/media/BrowseFragment.java
+++ b/src/com/android/car/media/BrowseFragment.java
@@ -213,8 +213,6 @@ public class BrowseFragment extends Fragment {
             mMediaBrowserViewModel.search(mSearchQuery);
             mMediaBrowserViewModel.setCurrentBrowseId(getCurrentMediaItemId());
         }
-        mMediaBrowserViewModel.contentStyleEnabled().observe(this, enabled ->
-                mBrowseAdapter.setContentStyleEnabled(enabled));
         mMediaBrowserViewModel.rootBrowsableHint().observe(this, hint ->
                 mBrowseAdapter.setRootBrowsableViewType(hint));
         mMediaBrowserViewModel.rootPlayableHint().observe(this, hint ->
diff --git a/src/com/android/car/media/browse/BrowseAdapter.java b/src/com/android/car/media/browse/BrowseAdapter.java
index 8fe4ba3..8713819 100644
--- a/src/com/android/car/media/browse/BrowseAdapter.java
+++ b/src/com/android/car/media/browse/BrowseAdapter.java
@@ -61,7 +61,6 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
     private MediaItemMetadata mParentMediaItem;
     private int mMaxSpanSize = 1;
 
-    private boolean mContentStyleEnabled = false;
     private BrowseItemViewType mRootBrowsableViewType = BrowseItemViewType.LIST_ITEM;
     private BrowseItemViewType mRootPlayableViewType = BrowseItemViewType.LIST_ITEM;
 
@@ -144,10 +143,6 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
         mMaxSpanSize = maxSpanSize;
     }
 
-    public void setContentStyleEnabled(boolean enabled) {
-        mContentStyleEnabled = enabled;
-    }
-
     public void setRootBrowsableViewType(int hintValue) {
         mRootBrowsableViewType = fromMediaHint(hintValue);
     }
@@ -265,7 +260,7 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
         String currentTitleGrouping = null;
         for (MediaItemMetadata item : items) {
             String titleGrouping = item.getTitleGrouping();
-            if (mContentStyleEnabled && !Objects.equals(currentTitleGrouping, titleGrouping)) {
+            if (!Objects.equals(currentTitleGrouping, titleGrouping)) {
                 currentTitleGrouping = titleGrouping;
                 itemsBuilder.addTitle(titleGrouping, null);
             }
@@ -282,7 +277,7 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
     }
 
     private BrowseItemViewType getBrowsableViewType(@Nullable MediaItemMetadata mediaItem) {
-        if (mediaItem == null || !mContentStyleEnabled) {
+        if (mediaItem == null) {
             return BrowseItemViewType.LIST_ITEM;
         }
         if (mediaItem.getBrowsableContentStyleHint() == 0) {
@@ -292,7 +287,7 @@ public class BrowseAdapter extends ListAdapter<BrowseViewData, BrowseViewHolder>
     }
 
     private BrowseItemViewType getPlayableViewType(@Nullable MediaItemMetadata mediaItem) {
-        if (mediaItem == null || !mContentStyleEnabled) {
+        if (mediaItem == null) {
             return BrowseItemViewType.LIST_ITEM;
         }
         if (mediaItem.getPlayableContentStyleHint() == 0) {