commit f82cd59476364a77683ee1d7686034184a2e6b61
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 21 16:35:30 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 21 16:35:30 2017 +0000
tree bb80ed45c4242ce48c7cb05143790108227885b0
parent 942d418da93c682d124a375820583ccef4193217
parent d6a00cfa3f6b37a7c787f4854670ae34fc1d5421

Merge "Add owners to setting packages."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67f18de..b3c72a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2390,6 +2390,18 @@
                 android:value="com.android.settings.datausage.DataUsageSummary" />
         </activity>
 
+        <activity android:name="Settings$MobileDataUsageListActivity"
+                  android:label="@string/cellular_data_usage"
+                  android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MOBILE_DATA_USAGE" />
+                <category android:name="
+                android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.datausage.DataUsageList" />
+        </activity>
+
         <activity android:name="Settings$DreamSettingsActivity"
                 android:label="@string/screensaver_settings_title"
                 android:icon="@drawable/ic_settings_display"

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ed5180b..05cc4c9 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -89,6 +89,7 @@
     public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DataUsageSummaryActivity extends SettingsActivity { /* empty */ }
+    public static class MobileDataUsageListActivity extends SettingsActivity { /* empty */ }
     public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SavedAccessPointsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TextToSpeechSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 53bd0be..7816b2d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -61,6 +61,7 @@
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.SupportFragment;
+import com.android.settings.datausage.DataUsageList;
 import com.android.settings.datausage.DataUsageSummary;
 import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;
 import com.android.settings.development.DevelopmentSettings;
@@ -247,6 +248,7 @@
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
             BluetoothDeviceDetailsFragment.class.getName(),
+            DataUsageList.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {