From aaa3fa06b1ac88db5769e8f24f2c7524992fd661 Mon Sep 17 00:00:00 2001 From: Craig Stout Date: Tue, 23 Dec 2014 11:29:05 -0800 Subject: [PATCH] Default to using wrap content for row height. Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae (cherry picked from commit 24ad89cd2b34170d245ec9b8c821fa5cc7babac7) --- .../com/example/android/leanback/BrowseFragment.java | 10 ++++++++-- .../src/com/example/android/leanback/RowsFragment.java | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java index a0a62f03e..aea6109a2 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java @@ -36,6 +36,9 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm private static final boolean TEST_ENTRANCE_TRANSITION = true; private static final int NUM_ROWS = 10; + // Row heights default to wrap content + private static final boolean USE_FIXED_ROW_HEIGHT = false; + private ArrayObjectAdapter mRowsAdapter; private BackgroundHelper mBackgroundHelper = new BackgroundHelper(); @@ -88,8 +91,11 @@ public class BrowseFragment extends android.support.v17.leanback.app.BrowseFragm private void setupRows() { ListRowPresenter lrp = new ListRowPresenter(); - lrp.setRowHeight(CardPresenter.getRowHeight(getActivity())); - lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity())); + + if (USE_FIXED_ROW_HEIGHT) { + lrp.setRowHeight(CardPresenter.getRowHeight(getActivity())); + lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity())); + } mRowsAdapter = new ArrayObjectAdapter(lrp); diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java index 2509bfc01..bf0840269 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/RowsFragment.java @@ -42,6 +42,9 @@ public class RowsFragment extends android.support.v17.leanback.app.RowsFragment private static final String TAG = "leanback.RowsFragment"; private static final int NUM_ROWS = 10; + // Row heights default to wrap content + private static final boolean USE_FIXED_ROW_HEIGHT = false; + private ArrayObjectAdapter mRowsAdapter; private OnRowsFirstLineSelectedListener mCallback; @@ -81,8 +84,11 @@ public class RowsFragment extends android.support.v17.leanback.app.RowsFragment private void setupRows() { ListRowPresenter lrp = new ListRowPresenter(); - lrp.setRowHeight(CardPresenter.getRowHeight(getActivity())); - lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity())); + + if (USE_FIXED_ROW_HEIGHT) { + lrp.setRowHeight(CardPresenter.getRowHeight(getActivity())); + lrp.setExpandedRowHeight(CardPresenter.getExpandedRowHeight(getActivity())); + } mRowsAdapter = new ArrayObjectAdapter(lrp);