From e7a6d1ca1ec17315bd6dd2b1de9938e4ba5c01ac Mon Sep 17 00:00:00 2001 From: Emily Chuang Date: Thu, 11 Oct 2018 18:23:45 +0800 Subject: [PATCH] Disable sliceView scrolling in the homepage. Set isScrollable() to false so as to have the "see more" option. Fixes: 117626982 Test: robotest Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a --- .../homepage/slices/SliceContextualCardRenderer.java | 1 + .../slices/SliceContextualCardRendererTest.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java index 705b990099c..5818e18546a 100644 --- a/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java +++ b/src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java @@ -82,6 +82,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, return; } + cardHolder.sliceView.setScrollable(false); cardHolder.sliceView.setTag(uri); //TODO(b/114009676): We will soon have a field to decide what slice mode we should set. cardHolder.sliceView.setMode(SliceView.MODE_LARGE); diff --git a/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java index 3239971d34f..c597a6e4fb0 100644 --- a/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java +++ b/tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java @@ -53,6 +53,18 @@ public class SliceContextualCardRendererTest { mRenderer = new SliceContextualCardRenderer(mContext, mLifecycleOwner); } + @Test + public void bindView_shouldSetScrollableToFalse() { + final String sliceUri = "content://com.android.settings.slices/action/flashlight"; + RecyclerView.ViewHolder viewHolder = getSliceViewHolder(); + + mRenderer.bindView(viewHolder, buildContextualCard(sliceUri)); + + assertThat( + ((SliceContextualCardRenderer.SliceViewHolder) viewHolder).sliceView.isScrollable + ()).isFalse(); + } + @Test public void bindView_invalidScheme_sliceShouldBeNull() { final String sliceUri = "contet://com.android.settings.slices/action/flashlight";