From f1cde92bdf92c7a76de907dc917d66069fd2dfb1 Mon Sep 17 00:00:00 2001 From: Raff Tsai Date: Thu, 1 Nov 2018 14:37:04 +0800 Subject: [PATCH] Add Category for contextual cards Fixes: 118650494 Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage" Change-Id: I46800c41402260351f146d0da42ec9f2329001af --- .../SettingsContextualCardProvider.java | 6 +++++- .../SettingsContextualCardProviderTest.java | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java index e394c03a03b..59c9ba95b77 100644 --- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java +++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java @@ -26,6 +26,7 @@ import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.wifi.WifiSlice; +import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardCategory; import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider; /** Provides dynamic card for SettingsIntelligence. */ @@ -40,16 +41,19 @@ public class SettingsContextualCardProvider extends ContextualCardProvider { ContextualCard.newBuilder() .setSliceUri(WifiSlice.WIFI_URI.toString()) .setCardName(KEY_WIFI) + .setCategory(ContextualCardCategory.IMPORTANT) .build(); final ContextualCard batteryInfoCard = ContextualCard.newBuilder() - .setSliceUri(BatterySlice.BATTERY_CARD_URI.toSafeString()) + .setSliceUri(BatterySlice.BATTERY_CARD_URI.toString()) .setCardName(BatterySlice.PATH_BATTERY_INFO) + .setCategory(ContextualCardCategory.DEFAULT) .build(); final ContextualCard connectedDeviceCard = ContextualCard.newBuilder() .setSliceUri(ConnectedDeviceSlice.CONNECTED_DEVICE_URI.toString()) .setCardName(ConnectedDeviceSlice.PATH_CONNECTED_DEVICE) + .setCategory(ContextualCardCategory.IMPORTANT) .build(); final ContextualCardList cards = ContextualCardList.newBuilder() .addCard(wifiCard) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java index 1932ab95e08..8b541c6455e 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java @@ -23,9 +23,12 @@ import android.content.ContentResolver; import android.net.Uri; import android.os.Bundle; +import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.wifi.WifiSlice; +import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardCategory; import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider; import org.junit.Before; @@ -62,4 +65,17 @@ public class SettingsContextualCardProviderTest { returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST)); assertThat(cards.getCardCount()).isEqualTo(actualNo); } + + @Test + public void getContextualCards_wifiSlice_shouldGetCorrectCategory() { + final ContextualCardList cards = mProvider.getContextualCards(); + ContextualCard wifiCard = null; + for (ContextualCard card : cards.getCardList()) { + if (card.getSliceUri().equals(WifiSlice.WIFI_URI.toString())) { + wifiCard = card; + } + } + + assertThat(wifiCard.getCategory()).isEqualTo(ContextualCardCategory.IMPORTANT); + } } \ No newline at end of file