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

Add Category for contextual cards

Browse Source 
Fixes: 118650494
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage"
Change-Id: I46800c41402260351f146d0da42ec9f2329001af
This commit is contained in:
Raff Tsai
2018-11-01 14:37:04 +08:00
parent 8cf919e933
commit f1cde92bdf
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
View File

@@ -26,6 +26,7 @@ import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
import com.android.settings.wifi.WifiSlice; 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 com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider;
/** Provides dynamic card for SettingsIntelligence. */ /** Provides dynamic card for SettingsIntelligence. */
@@ -40,16 +41,19 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
ContextualCard.newBuilder() ContextualCard.newBuilder()
.setSliceUri(WifiSlice.WIFI_URI.toString()) .setSliceUri(WifiSlice.WIFI_URI.toString())
.setCardName(KEY_WIFI) .setCardName(KEY_WIFI)
.setCategory(ContextualCardCategory.IMPORTANT)
.build(); .build();
final ContextualCard batteryInfoCard = final ContextualCard batteryInfoCard =
ContextualCard.newBuilder() ContextualCard.newBuilder()
.setSliceUri(BatterySlice.BATTERY_CARD_URI.toSafeString()) .setSliceUri(BatterySlice.BATTERY_CARD_URI.toString())
.setCardName(BatterySlice.PATH_BATTERY_INFO) .setCardName(BatterySlice.PATH_BATTERY_INFO)
.setCategory(ContextualCardCategory.DEFAULT)
.build(); .build();
final ContextualCard connectedDeviceCard = final ContextualCard connectedDeviceCard =
ContextualCard.newBuilder() ContextualCard.newBuilder()
.setSliceUri(ConnectedDeviceSlice.CONNECTED_DEVICE_URI.toString()) .setSliceUri(ConnectedDeviceSlice.CONNECTED_DEVICE_URI.toString())
.setCardName(ConnectedDeviceSlice.PATH_CONNECTED_DEVICE) .setCardName(ConnectedDeviceSlice.PATH_CONNECTED_DEVICE)
.setCategory(ContextualCardCategory.IMPORTANT)
.build(); .build();
final ContextualCardList cards = ContextualCardList.newBuilder() final ContextualCardList cards = ContextualCardList.newBuilder()
.addCard(wifiCard) .addCard(wifiCard)

16
tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java
View File

@@ -23,9 +23,12 @@ import android.content.ContentResolver;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
import com.android.settings.testutils.SettingsRobolectricTestRunner; 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 com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider;
import org.junit.Before; import org.junit.Before;
@@ -62,4 +65,17 @@ public class SettingsContextualCardProviderTest {
returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST)); returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST));
assertThat(cards.getCardCount()).isEqualTo(actualNo); 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);
}
} }