Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1cde92b authored by Raff Tsai's avatar Raff Tsai
Browse files

Add Category for contextual cards 

Fixes: 118650494
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage"
Change-Id: I46800c41402260351f146d0da42ec9f2329001af
parent 8cf919e9

src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java

+5 −1
Original line number Diff line number Diff line
@@ -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)

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

+16 −0
Original line number Diff line number Diff line
@@ -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