From 75a349c1b8054da8170330d59f6a46e3d6c391ff Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Wed, 13 Apr 2022 17:41:57 +0800
Subject: [PATCH] Add the title of the SettingsMainSwitchPreference in the
 mobile_network_settings.xml to avoid the preference can not be indexed.

Fix: 222021677
Test: manually test and review the UI
Change-Id: I53b1637e845489bc1df2e7b4216c56400fd28659
---
 res/xml/mobile_network_settings.xml                             | 1 +
 .../network/telephony/MobileNetworkSwitchController.java        | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 673994a9a9a..8206223689c 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -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
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
index 0be61e569cc..42fa95ecd99 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
@@ -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