Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I890335a0c0e31f7d3ea32c6130482e4ef0e20b88
This commit is contained in:
Edgar Wang
2020-07-29 12:47:42 +08:00
parent 82450ec7f4
commit 4e02ceb8b4
8 changed files with 14 additions and 14 deletions

View File

@@ -109,7 +109,7 @@ public class LocationEnabler implements LifecycleObserver, OnStart, OnStop {
if (isRestricted()) {
// Location toggling disabled by user restriction. Read the current location mode to
// update the location master switch.
// update the location primary switch.
if (Log.isLoggable(TAG, Log.INFO)) {
Log.i(TAG, "Restricted user, not setting location mode");
}

View File

@@ -41,7 +41,7 @@ import java.util.List;
* <ul>
* <li>Platform location controls</li>
* <ul>
* <li>In switch bar: location master switch. Used to toggle location on and off.
* <li>In switch bar: location primary switch. Used to toggle location on and off.
* </li>
* </ul>
* <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>

View File

@@ -60,9 +60,9 @@ public class LocationSwitchBarController implements SwitchBar.OnSwitchChangeList
@Override
public void onLocationModeChanged(int mode, boolean restricted) {
// Restricted user can't change the location mode, so disable the master switch. But in some
// corner cases, the location might still be enabled. In such case the master switch should
// be disabled but checked.
// Restricted user can't change the location mode, so disable the primary switch. But in
// some corner cases, the location might still be enabled. In such case the primary switch
// should be disabled but checked.
final boolean enabled = mLocationEnabler.isEnabled(mode);
final int userId = UserHandle.myUserId();
final RestrictedLockUtils.EnforcedAdmin admin =
@@ -90,7 +90,7 @@ public class LocationSwitchBarController implements SwitchBar.OnSwitchChangeList
}
/**
* Listens to the state change of the location master switch.
* Listens to the state change of the location primary switch.
*/
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {