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

Commit 8829e515 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: Ibe64a68d7bddf84780dfac33555c097ff55c97a8
parent 82450ec7

res/layout/wifi_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item" >

                <!--  Dummy to enable right-justification of checkbox -->

                <!--  Placeholder to enable right-justification of checkbox -->

                <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"
@@ -439,7 +439,7 @@ 
                    android:layout_height="wrap_content"

                    style="@style/wifi_item"

                    android:visibility="gone">

                <!--  Dummy to enable right-justification of warning -->

                <!--  Placeholder to enable right-justification of warning -->

                <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

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

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ public class AddAccountSettings extends Activity { 
         * or broadcasts.

         *

         * Unfortunately for legacy reasons we still need to support this. But

         * we can cripple the intent so that 3rd party authenticators can't

         * we can disable the intent so that 3rd party authenticators can't

         * fill in addressing information and launch arbitrary actions.

         */

        Intent identityIntent = new Intent();

src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class InstantAppDomainsPreferenceController extends AppInfoPreferenceCont 
        final String[] handledDomains =

                handledDomainSet.toArray(new String[handledDomainSet.size()]);

        instantAppDomainsPreference.setTitles(handledDomains);

        // Dummy values, unused in the implementation

        // placeholder values, unused in the implementation

        instantAppDomainsPreference.setValues(new int[handledDomains.length]);

    }

src/com/android/settings/applications/manageapplications/ResetAppsHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener, 
            public void run() {

                final List<ApplicationInfo> apps = mPm.getInstalledApplications(

                        PackageManager.GET_DISABLED_COMPONENTS);

                final List<String> whiteList = Arrays.asList(

                final List<String> allowList = Arrays.asList(

                        mContext.getResources().getStringArray(

                                R.array.config_skip_reset_apps_package_name));



                for (int i = 0; i < apps.size(); i++) {

                    ApplicationInfo app = apps.get(i);

                    if (whiteList.contains(app.packageName)) {

                    if (allowList.contains(app.packageName)) {

                        continue;

                    }

                    try {

src/com/android/settings/datetime/TimeFormatPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController 
    private static final String KEY_TIME_FORMAT = "24 hour";



    // Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc.

    // The date value is dummy (independent of actual date).

    // The date value is stubs (independent of actual date).

    private final Calendar mDummyDate;

    private final boolean mIsFromSUW;

    private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback;