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

Commit dd3feeb1 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Rename a bunch of mobile network files"

parents d7fb8833 2aae67a0

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
                       android:value="true" />

        </activity>



        <activity android:name=".network.telephony.MobileSettingsActivity"

        <activity android:name=".network.telephony.MobileNetworkActivity"

                  android:label="@string/network_settings_title"

                  android:theme="@style/Theme.Settings.Home"

                  android:launchMode="singleTask">

res/xml/network_setting_fragment.xml→res/xml/mobile_network_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
        settings:controller="com.android.settings.network.telephony.EuiccPreferenceController" />



    <PreferenceCategory

        android:key="calling"

        android:key="calling_category"

        android:title="@string/call_category">



        <PreferenceScreen

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

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


import com.android.settings.core.FeatureFlags;

import com.android.settings.core.PreferenceControllerMixin;

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

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

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.Utils;
@@ -147,7 +147,7 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl 
    public boolean handlePreferenceTreeClick(Preference preference) {

        if (KEY_MOBILE_NETWORK_SETTINGS.equals(preference.getKey())) {

            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2)) {

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

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

                mContext.startActivity(intent);

            } else {

                final Intent intent = new Intent(Intent.ACTION_MAIN);

src/com/android/settings/network/telephony/MobileSettingsActivity.java→src/com/android/settings/network/telephony/MobileNetworkActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import java.util.Comparator; 
import java.util.List;

import java.util.Objects;



public class MobileSettingsActivity extends SettingsBaseActivity {

public class MobileNetworkActivity extends SettingsBaseActivity {



    private static final String TAG = "MobileSettingsActivity";

    @VisibleForTesting
@@ -79,7 +79,8 @@ public class MobileSettingsActivity extends SettingsBaseActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.mobile_settings_container);



        setContentView(R.layout.mobile_network_settings_container);

        setActionBar(findViewById(R.id.mobile_action_bar));

        mPhoneChangeReceiver = new PhoneChangeReceiver();

        mSubscriptionManager = getSystemService(SubscriptionManager.class);
@@ -130,7 +131,7 @@ public class MobileSettingsActivity extends SettingsBaseActivity { 
        updateBottomNavigationView();



        if (savedInstanceState == null) {

            switchFragment(new MobileNetworkFragment(), getSubscriptionId());

            switchFragment(new MobileNetworkSettings(), getSubscriptionId());

        }

    }
@@ -172,7 +173,7 @@ public class MobileSettingsActivity extends SettingsBaseActivity { 
                        .setIcon(R.drawable.ic_settings_sim);

            }

            navigation.setOnNavigationItemSelectedListener(item -> {

                switchFragment(new MobileNetworkFragment(), item.getItemId());

                switchFragment(new MobileNetworkSettings(), item.getItemId());

                return true;

            });

        }
@@ -211,7 +212,7 @@ public class MobileSettingsActivity extends SettingsBaseActivity { 
            // When the radio changes (ex: CDMA->GSM), refresh the fragment.

            // This is very rare to happen.

            if (mCurSubscriptionId != SUB_ID_NULL) {

                switchFragment(new MobileNetworkFragment(), mCurSubscriptionId,

                switchFragment(new MobileNetworkSettings(), mCurSubscriptionId,

                        true /* forceUpdate */);

            }

        }