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

Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev

Browse Source
This commit is contained in:
Alex Johnston
2021-03-22 09:26:27 +00:00
committed by Android (Google) Code Review
parent 826a146c20 a47f5c1a1c
commit caf50d1203
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -91,11 +91,19 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser(); List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
final Context context = getPrefContext(); final Context context = getPrefContext();
final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList(); final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
final List<InputMethodInfo> enabledImis = mImm.getEnabledInputMethodList();
final int numImis = (imis == null ? 0 : imis.size()); final int numImis = (imis == null ? 0 : imis.size());
for (int i = 0; i < numImis; ++i) { for (int i = 0; i < numImis; ++i) {
final InputMethodInfo imi = imis.get(i); final InputMethodInfo imi = imis.get(i);
// TODO (b/182876800): Move this logic out of isAllowedByOrganization and
// into a new boolean.
// If an input method is enabled but not included in the permitted list, then set it as
// allowed by organization. Doing so will allow the user to disable the input method and
// remain complaint with the organization's policy. Once disabled, the input method
// cannot be re-enabled because it is not in the permitted list.
final boolean isAllowedByOrganization = permittedList == null final boolean isAllowedByOrganization = permittedList == null
|| permittedList.contains(imi.getPackageName()); || permittedList.contains(imi.getPackageName())
|| enabledImis.contains(imi);
final InputMethodPreference pref = new InputMethodPreference( final InputMethodPreference pref = new InputMethodPreference(
context, imi, true, isAllowedByOrganization, this); context, imi, true, isAllowedByOrganization, this);
pref.setIcon(imi.loadIcon(context.getPackageManager())); pref.setIcon(imi.loadIcon(context.getPackageManager()));