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

Commit 58a5338c authored by Stanley Wang's avatar Stanley Wang Committed by Android (Google) Code Review
Browse files

Merge "Add the title of the SettingsMainSwitchPreference in the... 

Merge "Add the title of the SettingsMainSwitchPreference in the mobile_network_settings.xml to avoid the preference can not be indexed." into tm-dev
parents ee6d283b 75a349c1

res/xml/mobile_network_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


    <com.android.settings.widget.SettingsMainSwitchPreference

        android:key="use_sim_switch"

        android:title="@string/mobile_network_use_sim_on"

        settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>



    <PreferenceCategory

src/com/android/settings/network/telephony/MobileNetworkSwitchController.java

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import androidx.lifecycle.LifecycleObserver; 
import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.SubscriptionsChangeListener;
@@ -70,7 +69,6 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mSwitchBar = (SettingsMainSwitchPreference) screen.findPreference(mPreferenceKey);

        mSwitchBar.setTitle(mContext.getString(R.string.mobile_network_use_sim_on));



        mSwitchBar.setOnBeforeCheckedChangeListener((toggleSwitch, isChecked) -> {

            // TODO b/135222940: re-evaluate whether to use