diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index bc1d0fa2fd4..f3fbf06310d 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -33,8 +33,6 @@ import androidx.annotation.VisibleForTesting; import androidx.slice.Slice; import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice; import com.android.settingslib.utils.AsyncLoaderCompat; import java.util.ArrayList; @@ -93,15 +91,6 @@ public class ContextualCardLoader extends AsyncLoaderCompat final String packageName = mContext.getPackageName(); final double rankingScore = 0.0; final List result = new ArrayList(); - result.add(new ContextualCard.Builder() - .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI) - .setName(DataUsageSlice.PATH_DATA_USAGE) - .setPackageName(packageName) - .setRankingScore(rankingScore) - .setAppVersion(appVersionCode) - .setCardType(ContextualCard.CardType.SLICE) - .setIsHalfWidth(false) - .build()); result.add(new ContextualCard.Builder() .setSliceUri(BatterySlice.BATTERY_CARD_URI) .setName(BatterySlice.PATH_BATTERY_INFO) @@ -111,15 +100,6 @@ public class ContextualCardLoader extends AsyncLoaderCompat .setCardType(ContextualCard.CardType.SLICE) .setIsHalfWidth(false) .build()); - result.add(new ContextualCard.Builder() - .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI) - .setName(DeviceInfoSlice.PATH_DEVICE_INFO) - .setPackageName(packageName) - .setRankingScore(rankingScore) - .setAppVersion(appVersionCode) - .setCardType(ContextualCard.CardType.SLICE) - .setIsHalfWidth(false) - .build()); return result; } diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java index 36c0a118023..e394c03a03b 100644 --- a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java +++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java @@ -21,10 +21,6 @@ import static android.provider.SettingsSlicesContract.KEY_WIFI; import android.annotation.Nullable; import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice; -import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice; -import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice; import com.android.settings.homepage.contextualcards.slices.ConnectedDeviceSlice; import com.android.settings.intelligence.ContextualCardProto.ContextualCard; import com.android.settings.intelligence.ContextualCardProto.ContextualCardList; @@ -45,26 +41,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider { .setSliceUri(WifiSlice.WIFI_URI.toString()) .setCardName(KEY_WIFI) .build(); - final ContextualCard dataUsageCard = - ContextualCard.newBuilder() - .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI.toString()) - .setCardName(DataUsageSlice.PATH_DATA_USAGE) - .build(); - final ContextualCard deviceInfoCard = - ContextualCard.newBuilder() - .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI.toString()) - .setCardName(DeviceInfoSlice.PATH_DEVICE_INFO) - .build(); - final ContextualCard storageInfoCard = - ContextualCard.newBuilder() - .setSliceUri(StorageSlice.STORAGE_CARD_URI.toString()) - .setCardName(StorageSlice.PATH_STORAGE_INFO) - .build(); - final ContextualCard emergencyInfoCard = - ContextualCard.newBuilder() - .setSliceUri(EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.toString()) - .setCardName(EmergencyInfoSlice.PATH_EMERGENCY_INFO_CARD) - .build(); final ContextualCard batteryInfoCard = ContextualCard.newBuilder() .setSliceUri(BatterySlice.BATTERY_CARD_URI.toSafeString()) @@ -77,10 +53,6 @@ public class SettingsContextualCardProvider extends ContextualCardProvider { .build(); final ContextualCardList cards = ContextualCardList.newBuilder() .addCard(wifiCard) - .addCard(dataUsageCard) - .addCard(deviceInfoCard) - .addCard(storageInfoCard) - .addCard(emergencyInfoCard) .addCard(batteryInfoCard) .addCard(connectedDeviceCard) .build(); diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java index 6aeb5c00f86..e98e36f56f4 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java @@ -22,8 +22,6 @@ import android.content.Context; import android.net.Uri; import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice; -import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -53,19 +51,10 @@ public class ContextualCardLoaderTest { mProvider); } - @Test - public void createStaticCards_shouldReturnFourCards() { - final List defaultData = mContextualCardLoader.createStaticCards(); - - assertThat(defaultData).hasSize(3); - } - @Test public void createStaticCards_shouldContainCorrectCards() { - final Uri dataUsage = DataUsageSlice.DATA_USAGE_CARD_URI; - final Uri deviceInfo = DeviceInfoSlice.DEVICE_INFO_CARD_URI; final Uri batteryInfo = BatterySlice.BATTERY_CARD_URI; - final List expectedUris = Arrays.asList(dataUsage, deviceInfo, batteryInfo); + final List expectedUris = Arrays.asList(batteryInfo); final List actualCardUris = mContextualCardLoader.createStaticCards().stream().map( ContextualCard::getSliceUri).collect(Collectors.toList()); @@ -90,7 +79,8 @@ public class ContextualCardLoaderTest { final String sliceUri = "contet://com.android.settings.slices/action/flashlight"; assertThat( - mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse(); + mContextualCardLoader.isCardEligibleToDisplay( + getContextualCard(sliceUri))).isFalse(); } @Test @@ -98,7 +88,8 @@ public class ContextualCardLoaderTest { final String sliceUri = "content://com.android.settings.test.slices/action/flashlight"; assertThat( - mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse(); + mContextualCardLoader.isCardEligibleToDisplay( + getContextualCard(sliceUri))).isFalse(); } private ContextualCard getContextualCard(String sliceUri) { 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 2c42379f86e..1932ab95e08 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java @@ -20,7 +20,6 @@ package com.android.settings.homepage.contextualcards; import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; -import android.content.Context; import android.net.Uri; import android.os.Bundle; @@ -38,15 +37,13 @@ import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class SettingsContextualCardProviderTest { - private Context mContext; private ContentResolver mResolver; private Uri mUri; private SettingsContextualCardProvider mProvider; @Before public void setUp() { - mContext = RuntimeEnvironment.application; - mResolver = mContext.getContentResolver(); + mResolver = RuntimeEnvironment.application.getContentResolver(); mUri = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) .authority(SettingsContextualCardProvider.CARD_AUTHORITY)