diff options
author | Simon Dai <sdai@google.com> | 2019-04-02 14:42:46 -0700 |
---|---|---|
committer | Simon Dai <sdai@google.com> | 2019-04-02 14:42:46 -0700 |
commit | 7d63cd937b5c45f70e5842f8b7751a109c3c2914 (patch) | |
tree | a4a1ec60dd3e85a4095f05752d17bd7f56569996 /src/com/android/car/media/browse | |
parent | 9ed87a20709a752812585d2513bf114f1ce264fb (diff) | |
download | Media-7d63cd937b5c45f70e5842f8b7751a109c3c2914.tar.gz |
Remove ContentStyle support check
Fixes: 128333911
Test: Manual
Change-Id: Ie406c48ac36eda171446e0f8f5226ce42f83dcc6
Diffstat (limited to 'src/com/android/car/media/browse')
-rw-r--r-- | src/com/android/car/media/browse/BrowseAdapter.java | 11 |
1 files changed, 3 insertions, 8 deletions
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) { |