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

Commit f0398e12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d5612408 52584e9b

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -2424,6 +2424,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

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,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 */ }

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

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,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;
@@ -251,6 +252,7 @@ public class SettingsGateway { 
            WebViewAppPicker.class.getName(),

            LockscreenDashboardFragment.class.getName(),

            BluetoothDeviceDetailsFragment.class.getName(),

            DataUsageList.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {