Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e02ceb8 authored by Edgar Wang's avatar Edgar Wang
Browse files

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
parent 82450ec7

src/com/android/settings/accounts/AccountSyncSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { 
                    }

                    // if we're enabling sync, this will request a sync as well

                    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,

                    // we want to force the sync, however.

                    if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) {

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

+1 −1
Original line number Diff line number Diff line
@@ -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

 * 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

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

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
            getPreferenceScreen().removeAll();

            return;

        }

        // Set up master switch

        // Set up primary switch

        mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();

        mSwitchBarController = new DevelopmentSwitchBarController(

                this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume; 
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".

 */

public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController

src/com/android/settings/location/LocationEnabler.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

            }