commit 8df1f9384e474e892636b6907cb835bd542a0a77
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 05 02:00:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 05 02:00:25 2018 +0000
tree d1925a86a96c676101301d80d36881c4d99f8e3e
parent 15cdfc4ec2f8c6965a4900d4dc8bf1bc73679f4e
parent 8a4d85460327f7ee5e9697d4214cc2a7f336d664

Merge "Add action/ or intent/ to all custom slice uri path."

src/com/android/settings/slices/CustomSliceRegistry.java

diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index 7ca92a9..80de3b2 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -25,7 +25,6 @@
 import android.net.Uri;
 import android.provider.SettingsSlicesContract;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 
@@ -87,6 +86,7 @@
     public static final Uri DATA_USAGE_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("data_usage_card")
             .build();
     /**
@@ -95,6 +95,7 @@
     public static final Uri DEVICE_INFO_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
             .appendPath("device_info_card")
             .build();
     /**
@@ -103,6 +104,7 @@
     public static final Uri EMERGENCY_INFO_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
             .appendPath("emergency_info_card")
             .build();
     /**
@@ -111,6 +113,7 @@
     public static final Uri ENHANCED_4G_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("enhanced_4g_lte")
             .build();
     /**
@@ -146,6 +149,7 @@
     public static final Uri STORAGE_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
             .appendPath("storage_card")
             .build();
     /**
@@ -191,6 +195,7 @@
     public static final Uri WIFI_CALLING_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
             .appendPath(WifiCallingSliceHelper.PATH_WIFI_CALLING)
             .build();
     /**
@@ -199,6 +204,7 @@
     public static final Uri WIFI_CALLING_PREFERENCE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath(WifiCallingSliceHelper.PATH_WIFI_CALLING_PREFERENCE)
             .build();
     /**