Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1"

res/values/strings.xml

@@ -1840,7 +1840,7 @@
     <string name="wifi_settings">Wi\u2011Fi</string>
 
     <!-- Used in the Wi-Fi settings screen to control turning on/off Wi-Fi entirely [CHAR LIMIT=30]-->
-    <string name="wifi_settings_master_switch_title">Use Wi\u2011Fi</string>
+    <string name="wifi_settings_primary_switch_title">Use Wi\u2011Fi</string>
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Wi\u2011Fi settings</string>
     <!-- Title of the Wi-fi settings entry in the left top level menu -->

res/xml/development_settings.xml

@@ -143,7 +143,7 @@
         <Preference android:key="clear_adb_keys"
                     android:title="@string/clear_adb_keys" />
 
-        <com.android.settings.widget.MasterSwitchPreference
+        <com.android.settings.widget.PrimarySwitchPreference
             android:fragment="com.android.settings.development.WirelessDebuggingFragment"
             android:key="toggle_adb_wireless"
             android:title="@string/enable_adb_wireless"

res/xml/network_and_internet.xml

@@ -29,7 +29,7 @@
         android:order="-40"
         settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.wifi.WifiSettings"
         android:key="main_toggle_wifi"
         android:title="@string/wifi_settings"
@@ -40,7 +40,7 @@
         <intent
             android:action="android.settings.WIFI_SETTINGS"
             android:targetClass="Settings$WifiSettingsActivity" />
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
     <com.android.settings.widget.AddPreference
         android:key="mobile_network_list"
@@ -80,7 +80,7 @@
         settings:userRestriction="no_config_tethering"
         settings:useAdminDisabledSummary="true" />
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.AllInOneTetherSettings"
         android:key="all_tether_settings"
         android:title="@string/tether_settings_title_all"

res/xml/privacy_dashboard_settings.xml

@@ -109,11 +109,11 @@
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:key="content_capture_custom_settings"
         android:title="@string/content_capture"
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
 </PreferenceScreen>

res/xml/storage_dashboard_fragment.xml

@@ -24,7 +24,7 @@
         android:order="0"
         settings:searchable="false"
         settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
         android:key="toggle_asm"
         android:title="@string/automatic_storage_manager_preference_title"

src/com/android/settings/core/TogglePreferenceController.java

@@ -20,7 +20,7 @@ import androidx.preference.TwoStatePreference;
 
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SliceData;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.TwoStateButtonPreference;
 
 /**
@@ -54,8 +54,8 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
     public void updateState(Preference preference) {
         if (preference instanceof TwoStatePreference) {
             ((TwoStatePreference) preference).setChecked(isChecked());
-        } else if (preference instanceof MasterSwitchPreference) {
+        } else if (preference instanceof PrimarySwitchPreference) {
-            ((MasterSwitchPreference) preference).setChecked(isChecked());
+            ((PrimarySwitchPreference) preference).setChecked(isChecked());
         } else if (preference instanceof TwoStateButtonPreference) {
             ((TwoStateButtonPreference) preference).setChecked(isChecked());
         } else {
@@ -66,7 +66,7 @@ public abstract class TogglePreferenceController extends BasePreferenceControlle
     @Override
     public final boolean onPreferenceChange(Preference preference, Object newValue) {
         // TwoStatePreference is a regular preference and can be handled by DashboardFragment
-        if (preference instanceof MasterSwitchPreference
+        if (preference instanceof PrimarySwitchPreference
                 || preference instanceof TwoStateButtonPreference) {
             FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
                     .logClickedPreference(preference, getMetricsCategory());

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

@@ -60,7 +60,7 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.drawer.ActivityTile;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -336,16 +336,16 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
     }
 
     private void setSwitchChecked(Preference pref, boolean checked) {
-        if (pref instanceof MasterSwitchPreference) {
+        if (pref instanceof PrimarySwitchPreference) {
-            ((MasterSwitchPreference) pref).setChecked(checked);
+            ((PrimarySwitchPreference) pref).setChecked(checked);
         } else if (pref instanceof SwitchPreference) {
             ((SwitchPreference) pref).setChecked(checked);
         }
     }
 
     private void setSwitchEnabled(Preference pref, boolean enabled) {
-        if (pref instanceof MasterSwitchPreference) {
+        if (pref instanceof PrimarySwitchPreference) {
-            ((MasterSwitchPreference) pref).setSwitchEnabled(enabled);
+            ((PrimarySwitchPreference) pref).setSwitchEnabled(enabled);
         } else {
             pref.setEnabled(enabled);
         }

src/com/android/settings/dashboard/DashboardFragment.java

@@ -40,7 +40,7 @@ import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerListHelper;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -530,7 +530,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
         return tile instanceof ProviderTile
                 ? new SwitchPreference(getPrefContext())
                 : tile.hasSwitch()
-                        ? new MasterSwitchPreference(getPrefContext())
+                        ? new PrimarySwitchPreference(getPrefContext())
                         : new Preference(getPrefContext());
     }
 

src/com/android/settings/development/WirelessDebuggingPreferenceController.java

@@ -35,7 +35,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -132,7 +132,7 @@ public class WirelessDebuggingPreferenceController extends DeveloperOptionsPrefe
         boolean enabled = Settings.Global.getInt(mContentResolver,
                 Settings.Global.ADB_WIFI_ENABLED, AdbPreferenceController.ADB_SETTING_OFF)
                     != AdbPreferenceController.ADB_SETTING_OFF;
-        ((MasterSwitchPreference) preference).setChecked(enabled);
+        ((PrimarySwitchPreference) preference).setChecked(enabled);
     }
 
     /**

src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java

@@ -29,8 +29,8 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchController;
+import com.android.settings.widget.PrimarySwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -43,8 +43,8 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
     @VisibleForTesting
     static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private MasterSwitchPreference mSwitch;
+    private PrimarySwitchPreference mSwitch;
-    private MasterSwitchController mSwitchController;
+    private PrimarySwitchController mSwitchController;
     private FragmentManager mFragmentManager;
 
     public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
@@ -77,7 +77,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
         mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
 
         if (mSwitch != null) {
-            mSwitchController = new MasterSwitchController(mSwitch);
+            mSwitchController = new PrimarySwitchController(mSwitch);
             mSwitchController.setListener(this);
             mSwitchController.startListening();
         }

src/com/android/settings/display/darkmode/DarkModePreference.java

@@ -19,14 +19,16 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.os.PowerManager;
 import android.util.AttributeSet;
+
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import java.time.LocalTime;
 
 /**
- * component for the display settings dark ui summary*/
+ * component for the display settings dark ui summary
-public class DarkModePreference extends MasterSwitchPreference {
+ */
+public class DarkModePreference extends PrimarySwitchPreference {
 
     private UiModeManager mUiModeManager;
     private DarkModeObserver mDarkModeObserver;

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

@@ -42,8 +42,8 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.widget.MasterSwitchController;
+import com.android.settings.widget.PrimarySwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TetherUtil;
 
 import java.util.concurrent.atomic.AtomicReference;
@@ -75,7 +75,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
                 }
             };
 
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     private TetherEnabler mTetherEnabler;
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -191,7 +191,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
     void initEnabler(Lifecycle lifecycle) {
         if (mPreference != null) {
             mTetherEnabler = new TetherEnabler(
-                    mContext, new MasterSwitchController(mPreference), mBluetoothPan);
+                    mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
             if (lifecycle != null) {
                 lifecycle.addObserver(mTetherEnabler);
             }

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

@@ -30,7 +30,7 @@ import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -96,8 +96,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
             MobilePlanPreferenceHost mobilePlanHost) {
         final MobilePlanPreferenceController mobilePlanPreferenceController =
                 new MobilePlanPreferenceController(context, mobilePlanHost);
-        final WifiMasterSwitchPreferenceController wifiPreferenceController =
+        final WifiPrimarySwitchPreferenceController wifiPreferenceController =
-                new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
+                new WifiPrimarySwitchPreferenceController(context, metricsFeatureProvider);
 
         final VpnPreferenceController vpnPreferenceController =
                 new VpnPreferenceController(context);

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

@@ -24,14 +24,14 @@ import android.text.TextUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
 
-    private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private final WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     private final TetherPreferenceController mTetherPreferenceController;
 
@@ -40,7 +40,7 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont
         mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
         mTetherPreferenceController = new TetherPreferenceController(
                 mContext, null /* lifecycle */);
-        mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
+        mWifiPreferenceController = new WifiPrimarySwitchPreferenceController(
                 mContext, null /* metrics */);
     }
 

src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java

@@ -33,13 +33,19 @@ import android.util.ArraySet;
 import android.util.IconDrawableFactory;
 import android.util.Slog;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.app.AppNotificationSettings;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -52,12 +58,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 /**
  * This controller displays a list of recently used apps and a "See all" button. If there is
  * no recently used app, "See all" will be displayed as "Notifications".
@@ -223,13 +223,13 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC
 
         // Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
         // Build a cached preference pool
-        final Map<String, MasterSwitchPreference> appPreferences = new ArrayMap<>();
+        final Map<String, PrimarySwitchPreference> appPreferences = new ArrayMap<>();
         int prefCount = mCategory.getPreferenceCount();
         for (int i = 0; i < prefCount; i++) {
             final Preference pref = mCategory.getPreference(i);
             final String key = pref.getKey();
             if (!TextUtils.equals(key, KEY_SEE_ALL)) {
-                appPreferences.put(key, (MasterSwitchPreference) pref);
+                appPreferences.put(key, (PrimarySwitchPreference) pref);
             }
         }
         final int recentAppsCount = recentApps.size();
@@ -244,10 +244,10 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC
             }
 
             boolean rebindPref = true;
-            MasterSwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
+            PrimarySwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
                     pkgName));
             if (pref == null) {
-                pref = new MasterSwitchPreference(prefContext);
+                pref = new PrimarySwitchPreference(prefContext);
                 rebindPref = false;
             }
             pref.setKey(getKey(app.getUserId(), pkgName));

src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java

@@ -39,7 +39,7 @@ import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -92,8 +92,8 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre
                         // the 0th index is the mAllNotificationsToggle which allows users to
                         // toggle all notifications from this app to bypass DND
                         for (int i = 1; i < mPreferenceCategory.getPreferenceCount(); i++) {
-                            MasterSwitchPreference childPreference =
+                            PrimarySwitchPreference childPreference =
-                                    (MasterSwitchPreference) mPreferenceCategory.getPreference(i);
+                                    (PrimarySwitchPreference) mPreferenceCategory.getPreference(i);
                             childPreference.setChecked(showNotificationInDnd(mChannels.get(i - 1)));
                         }
                         return true;
@@ -158,7 +158,7 @@ public class AppChannelsBypassingDndPreferenceController extends NotificationPre
         mPreferenceCategory.removeAll();
         mPreferenceCategory.addPreference(mAllNotificationsToggle);
         for (NotificationChannel channel : mChannels) {
-            MasterSwitchPreference channelPreference = new MasterSwitchPreference(mContext);
+            PrimarySwitchPreference channelPreference = new PrimarySwitchPreference(mContext);
             channelPreference.setDisabledByAdmin(mAdmin);
             channelPreference.setSwitchEnabled(
                     (mAdmin == null || !channelPreference.isDisabledByAdmin())

src/com/android/settings/notification/app/ChannelListPreferenceController.java

@@ -23,11 +23,7 @@ import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.graphics.BlendMode;
-import android.graphics.BlendModeColorFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -43,7 +39,7 @@ import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -177,7 +173,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
 
     protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
             final NotificationChannel channel, final boolean groupBlocked) {
-        MasterSwitchPreference channelPref = new MasterSwitchPreference(mContext);
+        PrimarySwitchPreference channelPref = new PrimarySwitchPreference(mContext);
         channelPref.setSwitchEnabled(mAdmin == null
                 && isChannelBlockable(channel)
                 && isChannelConfigurable(channel)
@@ -186,7 +182,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
         if (channel.getImportance() > IMPORTANCE_LOW) {
             channelPref.setIcon(getAlertingIcon());
         }
-        channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL);
+        channelPref.setIconSize(PrimarySwitchPreference.ICON_SIZE_SMALL);
         channelPref.setKey(channel.getId());
         channelPref.setTitle(channel.getName());
         channelPref.setSummary(NotificationBackend.getSentSummary(
@@ -210,7 +206,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
                     int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE;
                     channel.setImportance(importance);
                     channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference;
+                    PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;
                     channelPref1.setIcon(null);
                     if (channel.getImportance() > IMPORTANCE_LOW) {
                         channelPref1.setIcon(getAlertingIcon());
@@ -243,7 +239,7 @@ public class ChannelListPreferenceController extends NotificationPreferenceContr
                 int childCount = groupGroup.getPreferenceCount();
                 for (int i = 0; i < childCount; i++) {
                     Preference pref = groupGroup.getPreference(i);
-                    if (pref instanceof MasterSwitchPreference) {
+                    if (pref instanceof PrimarySwitchPreference) {
                         toRemove.add(pref);
                     }
                 }

src/com/android/settings/widget/PrimarySwitchController.java

@@ -23,17 +23,17 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-/*
+/**
- * The switch controller that is used to update the switch widget in the MasterSwitchPreference
+ * The switch controller that is used to update the switch widget in the PrimarySwitchPreference
  * layout.
  */
-public class MasterSwitchController extends SwitchWidgetController implements
+public class PrimarySwitchController extends SwitchWidgetController implements
-    Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener {
 
-    private final MasterSwitchPreference mPreference;
+    private final PrimarySwitchPreference mPreference;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public MasterSwitchController(MasterSwitchPreference preference) {
+    public PrimarySwitchController(PrimarySwitchPreference preference) {
         mPreference = preference;
         mMetricsFeatureProvider = FeatureFactory.getFactory(preference.getContext())
                 .getMetricsFeatureProvider();

src/com/android/settings/widget/PrimarySwitchPreference.java

@@ -33,27 +33,27 @@ import com.android.settingslib.RestrictedPreference;
  * A custom preference that provides inline switch toggle. It has a mandatory field for title, and
  * optional fields for icon and sub-text. And it can be restricted by admin state.
  */
-public class MasterSwitchPreference extends RestrictedPreference {
+public class PrimarySwitchPreference extends RestrictedPreference {
 
     private Switch mSwitch;
     private boolean mChecked;
     private boolean mCheckedSet;
     private boolean mEnableSwitch = true;
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs,
+    public PrimarySwitchPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
     }
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public PrimarySwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
-    public MasterSwitchPreference(Context context, AttributeSet attrs) {
+    public PrimarySwitchPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public MasterSwitchPreference(Context context) {
+    public PrimarySwitchPreference(Context context) {
         super(context);
     }
 
@@ -101,6 +101,11 @@ public class MasterSwitchPreference extends RestrictedPreference {
         return mSwitch != null && mChecked;
     }
 
+    /**
+     * Set the checked status to be {@code checked}.
+     *
+     * @param checked The new checked status
+     */
     public void setChecked(boolean checked) {
         // Always set checked the first time; don't assume the field's default of false.
         final boolean changed = mChecked != checked;
@@ -113,6 +118,11 @@ public class MasterSwitchPreference extends RestrictedPreference {
         }
     }
 
+    /**
+     * Set the Switch to be the status of {@code enabled}.
+     *
+     * @param enabled The new enabled status
+     */
     public void setSwitchEnabled(boolean enabled) {
         mEnableSwitch = enabled;
         if (mSwitch != null) {

src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java

@@ -21,8 +21,8 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchController;
+import com.android.settings.widget.PrimarySwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SummaryUpdater;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -32,19 +32,22 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
+/**
-public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
+ * PreferenceController to update the wifi state.
+ */
+public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
         LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
+    //TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
 
     public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
 
-    private MasterSwitchPreference mWifiPreference;
+    private PrimarySwitchPreference mWifiPreference;
     private WifiEnabler mWifiEnabler;
     private final WifiSummaryUpdater mSummaryHelper;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    public WifiMasterSwitchPreferenceController(Context context,
+    public WifiPrimarySwitchPreferenceController(Context context,
             MetricsFeatureProvider metricsFeatureProvider) {
         super(context);
         mMetricsFeatureProvider = metricsFeatureProvider;
@@ -85,8 +88,8 @@ public class WifiMasterSwitchPreferenceController extends AbstractPreferenceCont
 
     @Override
     public void onStart() {
-        mWifiEnabler = new WifiEnabler(mContext, new MasterSwitchController(mWifiPreference),
+        mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference),
-            mMetricsFeatureProvider);
+                mMetricsFeatureProvider);
     }
 
     @Override

src/com/android/settings/wifi/WifiSettings.java

@@ -220,8 +220,8 @@ public class WifiSettings extends RestrictedSettingsFragment
             setProgressBarVisible(false);
         }
         ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
-                R.string.wifi_settings_master_switch_title,
+                R.string.wifi_settings_primary_switch_title,
-                R.string.wifi_settings_master_switch_title);
+                R.string.wifi_settings_primary_switch_title);
     }
 
     @Override

tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java

@@ -50,7 +50,7 @@ import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.slices.BlockingSlicePrefController;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -327,12 +327,12 @@ public class DashboardFragmentTest {
     }
 
     @Test
-    public void createPreference_isActivityTileAndHasSwitch_returnMasterSwitchPreference() {
+    public void createPreference_isActivityTileAndHasSwitch_returnPrimarySwitchPreference() {
         mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri");
 
         final Preference pref = mTestFragment.createPreference(mActivityTile);
 
-        assertThat(pref).isInstanceOf(MasterSwitchPreference.class);
+        assertThat(pref).isInstanceOf(PrimarySwitchPreference.class);
     }
 
     @Test

tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java

@@ -33,7 +33,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.After;
@@ -54,7 +54,7 @@ public class WirelessDebuggingPreferenceControllerTest {
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock
     private IAdbManager mAdbManager;
     @Mock

tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java

@@ -42,7 +42,7 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +60,7 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest {
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mMockContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)

tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java

@@ -40,7 +40,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -117,7 +117,7 @@ public class AllInOneTetherPreferenceControllerTest {
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     private static final String PREF_KEY = "tether";
     private AllInOneTetherPreferenceController mController;

tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java

@@ -27,7 +27,7 @@ import android.os.UserManager;
 
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +47,7 @@ import org.robolectric.util.ReflectionHelpers;
 public class TopLevelNetworkEntryPreferenceControllerTest {
 
     @Mock
-    private WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     @Mock
     private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     @Mock

tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java

@@ -39,17 +39,17 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class MasterSwitchPreferenceTest {
+public class PrimarySwitchPreferenceTest {
 
     private Context mContext;
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     private PreferenceViewHolder mHolder;
     private LinearLayout mWidgetView;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
-        mPreference = new MasterSwitchPreference(mContext);
+        mPreference = new PrimarySwitchPreference(mContext);
         LayoutInflater inflater = LayoutInflater.from(mContext);
         mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
                 com.android.settingslib.R.layout.preference_two_target, null));

tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java

@@ -38,7 +38,7 @@ import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
@@ -52,21 +52,21 @@ import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowRestrictedLockUtilsInternal.class)
-public class WifiMasterSwitchPreferenceControllerTest {
+public class WifiPrimarySwitchPreferenceControllerTest {
 
     @Mock
     private WifiManager mWifiManager;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock
     private ConnectivityManager mConnectivityManager;
     @Mock
     private NetworkScoreManager mNetworkScoreManager;
 
     private Context mContext;
-    private WifiMasterSwitchPreferenceController mController;
+    private WifiPrimarySwitchPreferenceController mController;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
     @Before
@@ -76,20 +76,20 @@ public class WifiMasterSwitchPreferenceControllerTest {
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
         when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
-        mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
+        mController = new WifiPrimarySwitchPreferenceController(mContext, mMetricsFeatureProvider);
         when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
     }
 
     @Test
-    public void testWifiMasterSwitch_byDefault_shouldBeShown() {
+    public void testWifiPrimarySwitch_byDefault_shouldBeShown() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     @Config(qualifiers = "mcc999")
-    public void testWifiMasterSwitch_ifDisabled_shouldNotBeShown() {
+    public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() {
         assertThat(mController.isAvailable()).isFalse();
     }
 

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java

@@ -31,7 +31,7 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -66,7 +66,7 @@ public class WifiTetherPreferenceControllerTest {
     private WifiTetherPreferenceController mController;
     private Lifecycle mLifecycle;
     private LifecycleOwner mLifecycleOwner;
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     @Before
     public void setUp() {
@@ -76,7 +76,7 @@ public class WifiTetherPreferenceControllerTest {
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         FakeFeatureFactory.setupForTest();
-        mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
+        mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mConnectivityManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);