Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849

Change-Id: I1e4d0fd72093d6674f8960e9af500adaa9d8f36a
This commit is contained in:
Jason Chiu
2020-06-12 11:44:12 +00:00
committed by Automerger Merge Worker
3 changed files with 9 additions and 37 deletions

View File

@@ -77,9 +77,9 @@ public class EligibleCardCheckerTest {
@Test
public void isCardEligibleToDisplay_invalidScheme_returnFalse() {
final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
final Uri invalidUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
assertThat(mEligibleCardChecker.isCardEligibleToDisplay(getContextualCard(sliceUri)))
assertThat(mEligibleCardChecker.isCardEligibleToDisplay(getContextualCard(invalidUri)))
.isFalse();
}

View File

@@ -86,10 +86,10 @@ public class SliceContextualCardRendererTest {
@Test
public void bindView_invalidScheme_sliceShouldBeNull() {
final Uri sliceUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
final Uri invalidUri = Uri.parse("contet://com.android.settings.slices/action/flashlight");
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
mRenderer.bindView(viewHolder, buildContextualCard(sliceUri));
mRenderer.bindView(viewHolder, buildContextualCard(invalidUri));
assertThat(
((SliceFullCardRendererHelper.SliceViewHolder) viewHolder).sliceView.getSlice())