Updated misc in Contextual Settings Homepage

- Set static cards with full width and removed packageName from setName
method.
- Removed Storage card from createStaticCards method because it does not
belong to default category.
- Changed the parameter type of setSliceUri from String to Uri in ContextualCard.
- Added StorageSlice and DeviceInfoSlice to the contextual card
provider.
- Fixed test cases related to these changes.

bug: 117874766
Test: robotest
Change-Id: Ic2dca353f85d0b6191ab19882dd8c5cb9c6cc658
This commit is contained in:
Mill Chen
2018-10-17 22:46:54 +08:00
parent cb6b34e893
commit 77b2a30e9d
10 changed files with 45 additions and 43 deletions

View File

@@ -21,6 +21,8 @@ import static android.provider.SettingsSlicesContract.KEY_WIFI;
import android.annotation.Nullable;
import com.android.settings.homepage.deviceinfo.DataUsageSlice;
import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
import com.android.settings.homepage.deviceinfo.StorageSlice;
import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
import com.android.settings.wifi.WifiSlice;
@@ -43,11 +45,23 @@ public class SettingsContextualCardProvider extends ContextualCardProvider {
final ContextualCard dataUsageCard =
ContextualCard.newBuilder()
.setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI.toString())
.setCardName(DataUsageSlice.PATH_DATA_USAGE_CARD)
.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 ContextualCardList cards = ContextualCardList.newBuilder()
.addCard(wifiCard)
.addCard(dataUsageCard)
.addCard(deviceInfoCard)
.addCard(storageInfoCard)
.build();
return cards;