Stop showing account based cards in homepage.

Removed data usage/device info/emergency/storage cards

Bug: 118691898
Test: robotests
Change-Id: I9f1ef3f022be9ca37e3359a6820a716d4ebade0f
This commit is contained in:
Fan Zhang
2018-10-30 12:48:44 -07:00
parent 80306d1aef
commit 13b60bb15a
4 changed files with 6 additions and 66 deletions

View File

@@ -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<ContextualCard> 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<Uri> expectedUris = Arrays.asList(dataUsage, deviceInfo, batteryInfo);
final List<Uri> expectedUris = Arrays.asList(batteryInfo);
final List<Uri> 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) {

View File

@@ -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)