Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 942d418d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add an activity that starts DataUsageList fragment for mobile."

parents 8d3d1668 ff4b4eac
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -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"
+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class Settings extends SettingsActivity {
    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 */ }
+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
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 @@ public class SettingsGateway {
            WebViewAppPicker.class.getName(),
            LockscreenDashboardFragment.class.getName(),
            BluetoothDeviceDetailsFragment.class.getName(),
            DataUsageList.class.getName()
    };

    public static final String[] SETTINGS_FOR_RESTRICTED = {