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

Merge "Revert "Do not prebind sticky slices."" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-28 15:42:28 +00:00
committed by Android (Google) Code Review
parent c3b262ed52 740db33c5c
commit 591d761d43
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java
View File

@@ -18,8 +18,6 @@ package com.android.settings.homepage.contextualcards;
import static android.app.slice.Slice.HINT_ERROR; import static android.app.slice.Slice.HINT_ERROR;
import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -96,11 +94,6 @@ public class EligibleCardChecker implements Callable<ContextualCard> {
return false; return false;
} }
if (card.getCategory() == STICKY_VALUE) {
Log.d(TAG, "Sticky card, skip checking. Uri = " + card.getSliceUri());
return true;
}
final Slice slice = bindSlice(uri); final Slice slice = bindSlice(uri);
if (isSliceToggleable(slice)) { if (isSliceToggleable(slice)) {

30
tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java
View File

@@ -18,15 +18,11 @@ package com.android.settings.homepage.contextualcards;
import static android.app.slice.Slice.HINT_ERROR; import static android.app.slice.Slice.HINT_ERROR;
import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
@@ -68,32 +64,6 @@ public class EligibleCardCheckerTest {
assertThat(mEligibleCardChecker.isSliceToggleable(slice)).isTrue(); assertThat(mEligibleCardChecker.isSliceToggleable(slice)).isTrue();
} }
@Test
public void isCardEligibleToDisplay_stickyCard_returnTrue() {
final ContextualCard card = new ContextualCard.Builder()
.setName("test_card")
.setCardType(ContextualCard.CardType.SLICE)
.setCategory(STICKY_VALUE)
.setSliceUri(CustomSliceRegistry.FLASHLIGHT_SLICE_URI)
.build();
assertThat(mEligibleCardChecker.isCardEligibleToDisplay(card)).isTrue();
}
@Test
public void isCardEligibleToDisplay_stickyCard_shouldNotPrebind() {
final ContextualCard card = new ContextualCard.Builder()
.setName("test_card")
.setCardType(ContextualCard.CardType.SLICE)
.setCategory(STICKY_VALUE)
.setSliceUri(CustomSliceRegistry.FLASHLIGHT_SLICE_URI)
.build();
mEligibleCardChecker.isCardEligibleToDisplay(card);
verify(mEligibleCardChecker, never()).bindSlice(CustomSliceRegistry.FLASHLIGHT_SLICE_URI);
}
@Test @Test
public void isCardEligibleToDisplay_toggleSlice_hasInlineActionShouldBeTrue() { public void isCardEligibleToDisplay_toggleSlice_hasInlineActionShouldBeTrue() {
final ContextualWifiSlice wifiSlice = new ContextualWifiSlice(mContext); final ContextualWifiSlice wifiSlice = new ContextualWifiSlice(mContext);