Merge "Updated misc in Contextual Settings Homepage" (89d44bff) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/homepage/CardContentLoader.java

+6 −16

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import androidx.slice.Slice;

		import com.android.settings.homepage.deviceinfo.DataUsageSlice;
		import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
		import com.android.settings.homepage.deviceinfo.StorageSlice;
		import com.android.settingslib.utils.AsyncLoaderCompat;

		import java.util.ArrayList;
		@@ -94,13 +93,13 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
		final double rankingScore = 0.0;
		final List<ContextualCard> result = new ArrayList() {{
		add(new ContextualCard.Builder()
		.setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI.toString())
		.setName(packageName + "/" + DataUsageSlice.PATH_DATA_USAGE_CARD)
		.setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI)
		.setName(DataUsageSlice.PATH_DATA_USAGE)
		.setPackageName(packageName)
		.setRankingScore(rankingScore)
		.setAppVersion(appVersionCode)
		.setCardType(ContextualCard.CardType.SLICE)
		.setIsHalfWidth(true)
		.setIsHalfWidth(false)
		.build());
		//TODO(b/115971399): Will change following values of SliceUri and Name
		// after landing these slice cards.
		@@ -114,22 +113,13 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
		// .setIsHalfWidth(true)
		// .build());
		add(new ContextualCard.Builder()
		.setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI.toString())
		.setName(packageName + "/" + DeviceInfoSlice.PATH_DEVICE_INFO_CARD)
		.setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI)
		.setName(DeviceInfoSlice.PATH_DEVICE_INFO)
		.setPackageName(packageName)
		.setRankingScore(rankingScore)
		.setAppVersion(appVersionCode)
		.setCardType(ContextualCard.CardType.SLICE)
		.setIsHalfWidth(true)
		.build());
		add(new ContextualCard.Builder()
		.setSliceUri(StorageSlice.STORAGE_CARD_URI.toString())
		.setName(StorageSlice.PATH_STORAGE_CARD)
		.setPackageName(packageName)
		.setRankingScore(rankingScore)
		.setAppVersion(appVersionCode)
		.setCardType(ContextualCard.CardType.SLICE)
		.setIsHalfWidth(true)
		.setIsHalfWidth(false)
		.build());
		}};
		return result;

src/com/android/settings/homepage/ContextualCard.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,8 +244,8 @@ public class ContextualCard {
		return this;
		}

		public Builder setSliceUri(String sliceUri) {
		mSliceUri = sliceUri;
		public Builder setSliceUri(Uri sliceUri) {
		mSliceUri = sliceUri.toString();
		return this;
		}

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -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;

src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public class DataUsageSlice implements CustomSliceable {
		/**
		* The path denotes the unique name of data usage slice.
		*/
		public static final String PATH_DATA_USAGE_CARD = "data_usage_card";
		public static final String PATH_DATA_USAGE = "data_usage_card";

		/**
		* Backing Uri for the Data usage Slice.
		@@ -61,7 +61,7 @@ public class DataUsageSlice implements CustomSliceable {
		public static final Uri DATA_USAGE_CARD_URI = new Uri.Builder()
		.scheme(ContentResolver.SCHEME_CONTENT)
		.authority(SettingsSliceProvider.SLICE_AUTHORITY)
		.appendPath(PATH_DATA_USAGE_CARD)
		.appendPath(PATH_DATA_USAGE)
		.build();

		private final Context mContext;
		@@ -106,9 +106,9 @@ public class DataUsageSlice implements CustomSliceable {
		@Override
		public Intent getIntent() {
		final String screenTitle = mContext.getText(R.string.data_usage_wifi_title).toString();
		final Uri contentUri = new Uri.Builder().appendPath(PATH_DATA_USAGE_CARD).build();
		final Uri contentUri = new Uri.Builder().appendPath(PATH_DATA_USAGE).build();
		return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
		DataUsageSummary.class.getName(), PATH_DATA_USAGE_CARD, screenTitle,
		DataUsageSummary.class.getName(), PATH_DATA_USAGE, screenTitle,
		MetricsProto.MetricsEvent.SLICE)
		.setClassName(mContext.getPackageName(), SubSettings.class.getName())
		.setData(contentUri);

src/com/android/settings/homepage/deviceinfo/DeviceInfoSlice.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.content.Intent;
		import android.net.Uri;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.BidiFormatter;
		import android.text.TextDirectionHeuristics;
		import android.text.TextUtils;
		@@ -53,7 +52,7 @@ public class DeviceInfoSlice implements CustomSliceable {
		/**
		* The path denotes the unique name of device info slice
		*/
		public static final String PATH_DEVICE_INFO_CARD = "device_info_card";
		public static final String PATH_DEVICE_INFO = "device_info_card";

		/**
		* Backing Uri for the Device info Slice.
		@@ -61,16 +60,14 @@ public class DeviceInfoSlice implements CustomSliceable {
		public static final Uri DEVICE_INFO_CARD_URI = new Uri.Builder()
		.scheme(ContentResolver.SCHEME_CONTENT)
		.authority(SettingsSliceProvider.SLICE_AUTHORITY)
		.appendPath(PATH_DEVICE_INFO_CARD)
		.appendPath(PATH_DEVICE_INFO)
		.build();

		private final Context mContext;
		private final TelephonyManager mTelephonyManager;
		private final SubscriptionManager mSubscriptionManager;

		public DeviceInfoSlice(Context context) {
		mContext = context;
		mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
		mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
		}

		@@ -101,9 +98,9 @@ public class DeviceInfoSlice implements CustomSliceable {
		@Override
		public Intent getIntent() {
		final String screenTitle = mContext.getText(R.string.device_info_label).toString();
		final Uri contentUri = new Uri.Builder().appendPath(PATH_DEVICE_INFO_CARD).build();
		final Uri contentUri = new Uri.Builder().appendPath(PATH_DEVICE_INFO).build();
		return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
		MyDeviceInfoFragment.class.getName(), PATH_DEVICE_INFO_CARD, screenTitle,
		MyDeviceInfoFragment.class.getName(), PATH_DEVICE_INFO, screenTitle,
		MetricsProto.MetricsEvent.SLICE)
		.setClassName(mContext.getPackageName(), SubSettings.class.getName())
		.setData(contentUri);