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

Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28 am: 7b40a59fd1 am: e6eb3775ac am: 963ab5d9c5

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

Change-Id: I5d1d72d381234a45c48146cf398e44039f09e0fd
This commit is contained in:
Jason Chiu
2020-06-12 12:32:50 +00:00
committed by Automerger Merge Worker
parent 1fc9de2ee7 963ab5d9c5
commit f5eb561872
3 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
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();
}

4
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
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())