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

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

Merge "Add an intent for launching mobile network list"

parents f4bc4507 94d9790f

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -196,6 +196,19 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".Settings$MobileNetworkListActivity"

                  android:label="@string/network_settings_title"

                  android:parentActivityName="Settings$NetworkDashboardActivity">

            <intent-filter android:priority="1">

                <action android:name="android.settings.MOBILE_NETWORK_LIST" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.network.MobileNetworkListFragment"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity

            android:name=".Settings$ConnectedDeviceDashboardActivity"

            android:label="@string/connected_devices_dashboard_title"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public class Settings extends SettingsActivity { 
    public static class AdvancedConnectedDeviceActivity extends SettingsActivity { /* empty */ }

    public static class BluetoothDeviceDetailActivity extends SettingsActivity { /* empty */ }

    public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }

    public static class MobileNetworkListActivity extends SettingsActivity {}



    // Top level categories for new IA

    public static class NetworkDashboardActivity extends SettingsActivity {}

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

+3 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import com.android.settings.location.LocationSettings; 
import com.android.settings.location.ScanningSettings;

import com.android.settings.network.ApnEditor;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.MobileNetworkListFragment;

import com.android.settings.network.NetworkDashboardFragment;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;
@@ -273,7 +274,8 @@ public class SettingsGateway { 
            DataUsageList.class.getName(),

            ToggleBackupSettingFragment.class.getName(),

            PreviouslyConnectedDeviceDashboardFragment.class.getName(),

            BatterySaverScheduleSettings.class.getName()

            BatterySaverScheduleSettings.class.getName(),

            MobileNetworkListFragment.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {