diff options
author | govenliu <govenliu@google.com> | 2020-07-16 17:09:03 +0800 |
---|---|---|
committer | govenliu <govenliu@google.com> | 2020-07-21 20:56:22 +0800 |
commit | b70ddb9df7f829ce38ca7ad380336d26bcd58b89 (patch) | |
tree | 133fe419bf332f57ce022ba7017748198916f02e /src/com/android/settings/development/WirelessDebuggingPreferenceController.java | |
parent | 670d37c44e04980de9ea5616d18b48f5bb2a54ee (diff) |
[Wi-Fi] WiFi Settings inclusive language fix plan phase 1
Replace WiFi related terms which contain Master wording.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.
Bug: 161425297
Test: make RunSettingsRoboTests -j or
make RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=TopLevelNetworkEntryPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=PrimarySwitchPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I9395c50e092e124016609f88f7c8151554a0d874
Diffstat (limited to 'src/com/android/settings/development/WirelessDebuggingPreferenceController.java')
-rw-r--r-- | src/com/android/settings/development/WirelessDebuggingPreferenceController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java index a3daede3ca..369a0c8860 100644 --- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java +++ b/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); } /** |