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

Commit a6c50cac authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge changes Icda934a2,Ic07b18b3 

* changes:
  [Large Screen] Launch MobileNetworkSettings by SubSettingsLauncher
  [Large Screen] Launch MobileNetworkActivity as a fragment for split mode
parents d6482baa 6f914da0

AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ 
        <activity android:name=".network.telephony.MobileNetworkActivity"

                  android:label="@string/network_settings_title"

                  android:exported="true"

                  android:taskAffinity="com.android.settings.root"

                  android:launchMode="singleTask"

                  android:configChanges="orientation|screenSize|keyboardHidden">

            <!-- Note: Since the framework does not support the multiple requests of network scan
@@ -257,6 +258,14 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".Settings$SubscriptionSettingsActivity"

            android:label="@string/network_settings_title"

            android:exported="false">

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

                       android:value="com.android.settings.network.telephony.MobileNetworkSettings"/>

        </activity>



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

                  android:exported="true"

                  android:label="@string/network_settings_title">

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -304,6 +304,8 @@ public class Settings extends SettingsActivity { 
    public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }

    public static class MobileNetworkListActivity extends SettingsActivity {}

    public static class PowerMenuSettingsActivity extends SettingsActivity {}

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



    /**

     * Activity for BugReportHandlerPicker.

     */

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

+3 −1
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ import com.android.settings.network.NetworkDashboardFragment; 
import com.android.settings.network.NetworkProviderSettings;

import com.android.settings.network.apn.ApnEditor;

import com.android.settings.network.apn.ApnSettings;

import com.android.settings.network.telephony.MobileNetworkSettings;

import com.android.settings.network.telephony.NetworkSelectSettings;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;
@@ -329,7 +330,8 @@ public class SettingsGateway { 
            AlarmsAndRemindersDetails.class.getName(),

            MediaManagementAppsDetails.class.getName(),

            AutoBrightnessSettings.class.getName(),

            OneHandedSettings.class.getName()

            OneHandedSettings.class.getName(),

            MobileNetworkSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {

src/com/android/settings/network/MobileNetworkSummaryController.java

+3 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.settings.R; 
import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.network.helper.SubscriptionAnnotation;

import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.AddPreference;

import com.android.settingslib.Utils;
@@ -190,12 +190,8 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController 
                SubscriptionAnnotation info = subs.get(0);

                if (info.getSubInfo().isEmbedded() || info.isActive()

                        || mStatusCache.isPhysicalSimDisableSupport()) {

                    final Intent intent = new Intent(mContext, MobileNetworkActivity.class);

                    intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());

                    // MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane.

                    MobileNetworkTwoPaneUtils.registerTwoPaneForMobileNetwork(mContext, intent,

                            null);

                    mContext.startActivity(intent);

                    MobileNetworkUtils.launchMobileNetworkSettings(mContext,

                            info.getSubInfo());

                    return true;

                }

src/com/android/settings/network/NetworkProviderDownloadedSimListController.java

+1 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.preference.PreferenceCategory; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -128,11 +127,7 @@ public class NetworkProviderDownloadedSimListController extends 
            pref.setSummary(getSummary(subId));



            pref.setOnPreferenceClickListener(clickedPref -> {

                final Intent intent = new Intent(mContext, MobileNetworkActivity.class);

                intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());

                // MobileNetworkActivity is singleTask, set SplitPairRule to show in 2-pane.

                MobileNetworkTwoPaneUtils.registerTwoPaneForMobileNetwork(mContext, intent, null);

                mContext.startActivity(intent);

                MobileNetworkUtils.launchMobileNetworkSettings(mContext, info);

                return true;

            });

            mPreferences.put(subId, pref);