PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update language to comply with Android's inclusive language guidance

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/AppRestrictionsFragment.java
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
// able to toggle this app ON (it's ON by default and immutable).
// 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) {
requestRestrictionsForApp(packageName, p, false);
}
@@ -432,9 +432,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private String getPackageSummary(PackageInfo pi, AppRestrictionsHelper.SelectableAppInfo app) {
// Check for 3 cases:
// - Slave entry that can see primary user accounts
// - Slave entry that cannot see primary user accounts
// - Master entry that can see primary user accounts
// - Secondary entry that can see primary user accounts
// - Secondary entry that cannot see primary user accounts
// - Primary entry that can see primary user accounts
// Otherwise no summary is returned
if (app.masterEntry != null) {
if (mRestrictedProfile && pi.restrictedAccountType != null) {