From 740db33c5ced84c3f47dbdbde539f28e493d8f6d Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Thu, 28 May 2020 12:14:04 +0000 Subject: [PATCH] Revert "Do not prebind sticky slices." This reverts commit ac59ea8e2387158415d59bc4a9389987c3ef5c0f. Reason for revert: Fix it using another approach in ag/11629780. The prebind part will be helpful to cache slice data. Bug: 152365480 Change-Id: Iebed42027552a923907647b61480f135ac4f4097 --- .../contextualcards/EligibleCardChecker.java | 7 ----- .../EligibleCardCheckerTest.java | 30 ------------------- 2 files changed, 37 deletions(-) diff --git a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java index 7fd8a2fd5e6..0fcde265696 100644 --- a/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java +++ b/src/com/android/settings/homepage/contextualcards/EligibleCardChecker.java @@ -18,8 +18,6 @@ package com.android.settings.homepage.contextualcards; 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.content.ContentResolver; import android.content.Context; @@ -96,11 +94,6 @@ public class EligibleCardChecker implements Callable { return false; } - if (card.getCategory() == STICKY_VALUE) { - Log.d(TAG, "Sticky card, skip checking. Uri = " + card.getSliceUri()); - return true; - } - final Slice slice = bindSlice(uri); if (isSliceToggleable(slice)) { diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java index e2369195308..23ae2f3a75c 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/EligibleCardCheckerTest.java @@ -18,15 +18,11 @@ package com.android.settings.homepage.contextualcards; 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 org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import android.content.Context; import android.net.Uri; @@ -68,32 +64,6 @@ public class EligibleCardCheckerTest { 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 public void isCardEligibleToDisplay_toggleSlice_hasInlineActionShouldBeTrue() { final ContextualWifiSlice wifiSlice = new ContextualWifiSlice(mContext);