PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable sliceView scrolling in the homepage."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-12 05:05:03 +00:00
committed by Android (Google) Code Review
parent a687b5d28d e7a6d1ca1e
commit ddd70cdbf6
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/homepage/slices/SliceContextualCardRenderer.java
View File

@@ -82,6 +82,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer,
return; return;
} }
cardHolder.sliceView.setScrollable(false);
cardHolder.sliceView.setTag(uri); cardHolder.sliceView.setTag(uri);
//TODO(b/114009676): We will soon have a field to decide what slice mode we should set. //TODO(b/114009676): We will soon have a field to decide what slice mode we should set.
cardHolder.sliceView.setMode(SliceView.MODE_LARGE); cardHolder.sliceView.setMode(SliceView.MODE_LARGE);

12
tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java
View File

@@ -53,6 +53,18 @@ public class SliceContextualCardRendererTest {
mRenderer = new SliceContextualCardRenderer(mContext, mLifecycleOwner); 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 @Test
public void bindView_invalidScheme_sliceShouldBeNull() { public void bindView_invalidScheme_sliceShouldBeNull() {
final String sliceUri = "contet://com.android.settings.slices/action/flashlight"; final String sliceUri = "contet://com.android.settings.slices/action/flashlight";