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

Stop showing account based cards in homepage.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -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<List<ContextualCard>
final String packageName = mContext.getPackageName();
final double rankingScore = 0.0;
final List<ContextualCard> 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<List<ContextualCard>
.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;
}

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

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