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

Commit 0d11f25a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents 0eb10919 a8742aa7
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1474,8 +1474,8 @@
        <item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>
    </string-array>

    <!-- A whitelist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
    <string-array name="whitelist_hide_summary_in_battery_usage" translatable="false">
    <!-- An allowlist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
    <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
        <!-- Google -->
        <item>"com.google.android.googlequicksearchbox"</item>
    </string-array>
+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@
        -->
    </string-array>

    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
    <string-array name="slice_whitelist_package_names" translatable="false"/>
    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
    <string-array name="slice_allowlist_package_names" translatable="false"/>

    <!-- Whether or not App & Notification screen should display recently used apps -->
    <bool name="config_display_recent_apps">true</bool>
+4 −10
Original line number Diff line number Diff line
@@ -1418,9 +1418,6 @@
    <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
    <string name="lockpassword_pin_recently_used">Device admin doesn\'t allow using a recent PIN</string>
    <!-- Error shown when a user is choosing a PIN for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PIN that's less common and more complicated. -->
    <string name="lockpassword_pin_blacklisted_by_admin">Common PINs are blocked by your IT admin. Try a different PIN.</string>
    <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
    <string name="lockpassword_illegal_character">This can\'t include an invalid character</string>
@@ -1478,9 +1475,6 @@
    <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent
        password</string>
    <!-- Error shown when a user is choosing a PASSWORD for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PASSWORD that's less common and more complicated. -->
    <string name="lockpassword_password_blacklisted_by_admin">Common passwords are blocked by your IT admin. Try a different password.</string>
    <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
    <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
        of digits isn\'t allowed</string>
@@ -5533,8 +5527,8 @@
    <string name="background_activity_summary">Allow the app to run in the background</string>
    <!-- Summary for the background activity when it is disabled [CHAR_LIMIT=120] -->
    <string name="background_activity_summary_disabled">App not allowed to run in background</string>
    <!-- TODO: Pending UX review. Summary for the background activity when it is whitlisted [CHAR_LIMIT=120] -->
    <string name="background_activity_summary_whitelisted">Background usage can\u2019t be restricted</string>
    <!-- TODO: Pending UX review. Summary for the background activity when it is allowlisted [CHAR_LIMIT=120] -->
    <string name="background_activity_summary_allowlisted">Background usage can\u2019t be restricted</string>
    <!-- TODO: Pending UX review. Title for the warning dialog to show to the user when limiting background activity for an app -->
    <string name="background_activity_warning_dialog_title">Limit background activity?</string>
    <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->
@@ -10505,8 +10499,8 @@
    <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
    <string name="unrestricted_data_saver">Unrestricted data</string>
    <!-- Description of message shown when app is blacklisted for background data access [CHAR LIMIT=NONE] -->
    <string name="restrict_background_blacklisted">Background data is turned off</string>
    <!-- Description of message shown when app is blocklisted for background data access [CHAR LIMIT=NONE] -->
    <string name="restrict_background_blocklisted">Background data is turned off</string>
    <!-- Summary for the Data Saver feature being on [CHAR LIMIT=NONE] -->
    <string name="data_saver_on">On</string>
+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
            keepEnabledPackages.add(euicc.packageName);
        }

        keepEnabledPackages.addAll(getEnabledPackageWhitelist());
        keepEnabledPackages.addAll(getEnabledPackageAllowlist());

        final LocationManager locationManager =
                (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
@@ -170,7 +170,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
        return keepEnabledPackages;
    }

    private Set<String> getEnabledPackageWhitelist() {
    private Set<String> getEnabledPackageAllowlist() {
        final Set<String> keepEnabledPackages = new ArraySet<>();

        // Keep Settings intelligence enabled, otherwise search feature will be disabled.
+3 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
    }

    private void logNonConfigurableAppMetrics() {
        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
            logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_ADMIN_RESTRICTED);
            return;
        }
@@ -382,7 +382,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
    private boolean refreshUiForNonConfigurableApps() {
        mSwitchPref.setChecked(false);
        mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);
        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
            mInstallBanner.setVisible(false);
            mSwitchPref.setDisabledByAdmin(RestrictedLockUtils.getProfileOrDeviceOwner(
                    mContext, mWorkProfile));
@@ -417,7 +417,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
        return false;
    }

    private boolean isCrossProfilePackageWhitelisted(String packageName) {
    private boolean isCrossProfilePackageAllowlisted(String packageName) {
        return mContext.getSystemService(DevicePolicyManager.class)
                .getAllCrossProfilePackages().contains(packageName);
    }
Loading