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

@@ -294,7 +294,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
} }
// if we're enabling sync, this will request a sync as well // if we're enabling sync, this will request a sync as well
ContentResolver.setSyncAutomaticallyAsUser(account, authority, syncOn, userId); ContentResolver.setSyncAutomaticallyAsUser(account, authority, syncOn, userId);
// if the master sync switch is off, the request above will // if the primary sync switch is off, the request above will
// get dropped. when the user clicks on this toggle, // get dropped. when the user clicks on this toggle,
// we want to force the sync, however. // we want to force the sync, however.
if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) { if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) {

View File

@@ -24,7 +24,7 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/** /**
* This controller is used for preference that has fragment or launch intent defined in the * This controller is used for preference that has fragment or launch intent defined in the
* preference xml, and do not need any handling to update the preference state, except when the * preference xml, and do not need any handling to update the preference state, except when the
* master developer options switch is turned on/off, the preference needs to be enabled/disabled. * primary developer options switch is turned on/off, the preference needs to be enabled/disabled.
* *
*/ */
public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController

View File

@@ -189,7 +189,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
return; return;
} }
// Set up master switch // Set up primary switch
mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar(); mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
mSwitchBarController = new DevelopmentSwitchBarController( mSwitchBarController = new DevelopmentSwitchBarController(
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable, this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,

View File

@@ -43,7 +43,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/** /**
* This controls the master switch controller in the developer options page for * This controls the primary switch controller in the developer options page for
* "Wireless debugging". * "Wireless debugging".
*/ */
public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController

View File

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

View File

@@ -41,7 +41,7 @@ import java.util.List;
* <ul> * <ul>
* <li>Platform location controls</li> * <li>Platform location controls</li>
* <ul> * <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> * </li>
* </ul> * </ul>
* <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li> * <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>

View File

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

View File

@@ -406,7 +406,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
// Get and populate the defaults, since the user is not going to be // Get and populate the defaults, since the user is not going to be
// able to toggle this app ON (it's ON by default and immutable). // able to toggle this app ON (it's ON by default and immutable).
// Only do this for restricted profiles, not single-user restrictions // Only do this for restricted profiles, not single-user restrictions
// Also don't do this for slave icons // Also don't do this for secondary icons
if (app.masterEntry == null) { if (app.masterEntry == null) {
requestRestrictionsForApp(packageName, p, false); requestRestrictionsForApp(packageName, p, false);
} }
@@ -432,9 +432,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private String getPackageSummary(PackageInfo pi, AppRestrictionsHelper.SelectableAppInfo app) { private String getPackageSummary(PackageInfo pi, AppRestrictionsHelper.SelectableAppInfo app) {
// Check for 3 cases: // Check for 3 cases:
// - Slave entry that can see primary user accounts // - Secondary entry that can see primary user accounts
// - Slave entry that cannot see primary user accounts // - Secondary entry that cannot see primary user accounts
// - Master entry that can see primary user accounts // - Primary entry that can see primary user accounts
// Otherwise no summary is returned // Otherwise no summary is returned
if (app.masterEntry != null) { if (app.masterEntry != null) {
if (mRestrictedProfile && pi.restrictedAccountType != null) { if (mRestrictedProfile && pi.restrictedAccountType != null) {