Merge "Add an intent for launching mobile network list"
This commit is contained in:
committed by
Android (Google) Code Review
commit
3009077110
@@ -196,6 +196,19 @@
|
|||||||
android:value="true" />
|
android:value="true" />
|
||||||
</activity>
|
</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
|
<activity
|
||||||
android:name=".Settings$ConnectedDeviceDashboardActivity"
|
android:name=".Settings$ConnectedDeviceDashboardActivity"
|
||||||
android:label="@string/connected_devices_dashboard_title"
|
android:label="@string/connected_devices_dashboard_title"
|
||||||
|
@@ -162,6 +162,7 @@ public class Settings extends SettingsActivity {
|
|||||||
public static class AdvancedConnectedDeviceActivity extends SettingsActivity { /* empty */ }
|
public static class AdvancedConnectedDeviceActivity extends SettingsActivity { /* empty */ }
|
||||||
public static class BluetoothDeviceDetailActivity extends SettingsActivity { /* empty */ }
|
public static class BluetoothDeviceDetailActivity extends SettingsActivity { /* empty */ }
|
||||||
public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }
|
public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }
|
||||||
|
public static class MobileNetworkListActivity extends SettingsActivity {}
|
||||||
|
|
||||||
// Top level categories for new IA
|
// Top level categories for new IA
|
||||||
public static class NetworkDashboardActivity extends SettingsActivity {}
|
public static class NetworkDashboardActivity extends SettingsActivity {}
|
||||||
|
@@ -97,6 +97,7 @@ import com.android.settings.location.LocationSettings;
|
|||||||
import com.android.settings.location.ScanningSettings;
|
import com.android.settings.location.ScanningSettings;
|
||||||
import com.android.settings.network.ApnEditor;
|
import com.android.settings.network.ApnEditor;
|
||||||
import com.android.settings.network.ApnSettings;
|
import com.android.settings.network.ApnSettings;
|
||||||
|
import com.android.settings.network.MobileNetworkListFragment;
|
||||||
import com.android.settings.network.NetworkDashboardFragment;
|
import com.android.settings.network.NetworkDashboardFragment;
|
||||||
import com.android.settings.nfc.AndroidBeam;
|
import com.android.settings.nfc.AndroidBeam;
|
||||||
import com.android.settings.nfc.PaymentSettings;
|
import com.android.settings.nfc.PaymentSettings;
|
||||||
@@ -273,7 +274,8 @@ public class SettingsGateway {
|
|||||||
DataUsageList.class.getName(),
|
DataUsageList.class.getName(),
|
||||||
ToggleBackupSettingFragment.class.getName(),
|
ToggleBackupSettingFragment.class.getName(),
|
||||||
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
|
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
|
||||||
BatterySaverScheduleSettings.class.getName()
|
BatterySaverScheduleSettings.class.getName(),
|
||||||
|
MobileNetworkListFragment.class.getName()
|
||||||
};
|
};
|
||||||
|
|
||||||
public static final String[] SETTINGS_FOR_RESTRICTED = {
|
public static final String[] SETTINGS_FOR_RESTRICTED = {
|
||||||
|
Reference in New Issue
Block a user