PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stanley Wang
2022-04-14 01:52:44 +00:00
committed by Android (Google) Code Review
parent ee6d283b82 75a349c1b8
commit 58a5338c78
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/mobile_network_settings.xml
View File

@@ -20,6 +20,7 @@
<com.android.settings.widget.SettingsMainSwitchPreference <com.android.settings.widget.SettingsMainSwitchPreference
android:key="use_sim_switch" android:key="use_sim_switch"
android:title="@string/mobile_network_use_sim_on"
settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/> settings:controller="com.android.settings.network.telephony.MobileNetworkSwitchController"/>
<PreferenceCategory <PreferenceCategory

2
src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
View File

@@ -28,7 +28,6 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.SubscriptionsChangeListener; import com.android.settings.network.SubscriptionsChangeListener;
@@ -70,7 +69,6 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mSwitchBar = (SettingsMainSwitchPreference) screen.findPreference(mPreferenceKey); mSwitchBar = (SettingsMainSwitchPreference) screen.findPreference(mPreferenceKey);
mSwitchBar.setTitle(mContext.getString(R.string.mobile_network_use_sim_on));
mSwitchBar.setOnBeforeCheckedChangeListener((toggleSwitch, isChecked) -> { mSwitchBar.setOnBeforeCheckedChangeListener((toggleSwitch, isChecked) -> {
// TODO b/135222940: re-evaluate whether to use // TODO b/135222940: re-evaluate whether to use