summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-05-25 02:35:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-05-25 02:35:48 +0000
commit9fa902c3364ded2c72f47493c1f45dd2d1291817 (patch)
tree9298b256a774498d56df2ff438a04f067ee341ce
parente8f6fb8b486c5ae99452d2fc93a922d80df1d76d (diff)
parented928e81cc8e194c409bbbb79d889231e4929886 (diff)
downloadMedia-9fa902c3364ded2c72f47493c1f45dd2d1291817.tar.gz
Merge "Update ContentForwardStrategy for ContentStyle" into pi-dev
-rw-r--r--src/com/android/car/media/browse/ContentForwardStrategy.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/car/media/browse/ContentForwardStrategy.java b/src/com/android/car/media/browse/ContentForwardStrategy.java
index 3e03aed..b9e2fba 100644
--- a/src/com/android/car/media/browse/ContentForwardStrategy.java
+++ b/src/com/android/car/media/browse/ContentForwardStrategy.java
@@ -16,6 +16,8 @@
package com.android.car.media.browse;
+import android.os.Bundle;
+import com.android.car.media.common.ContentStyleMediaConstants;
import com.android.car.media.common.MediaItemMetadata;
/**
@@ -94,12 +96,18 @@ public interface ContentForwardStrategy {
@Override
public BrowseItemViewType getBrowsableViewType(MediaItemMetadata mediaItem) {
- return BrowseItemViewType.PANEL_ITEM;
+ return (mediaItem.getBrowsableContentStyleHint()
+ == ContentStyleMediaConstants.CONTENT_STYLE_LIST_ITEM_HINT_VALUE)
+ ? BrowseItemViewType.LIST_ITEM
+ : BrowseItemViewType.PANEL_ITEM;
}
@Override
public BrowseItemViewType getPlayableViewType(MediaItemMetadata mediaItem) {
- return BrowseItemViewType.GRID_ITEM;
+ return (mediaItem.getPlayableContentStyleHint()
+ == ContentStyleMediaConstants.CONTENT_STYLE_LIST_ITEM_HINT_VALUE)
+ ? BrowseItemViewType.LIST_ITEM
+ : BrowseItemViewType.GRID_ITEM;
}
@Override