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

Commit 4ba6f93b authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Extract out InputMethodSettings" into main

parents e1abb628 296b1e69

services/core/java/com/android/server/inputmethod/HardwareKeyboardShortcutController.java

+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ final class HardwareKeyboardShortcutController { 
    @GuardedBy("ImfLock.class")

    void reset(@NonNull ArrayMap<String, InputMethodInfo> methodMap) {

        mSubtypeHandles.clear();

        final InputMethodUtils.InputMethodSettings settings =

                new InputMethodUtils.InputMethodSettings(methodMap, mUserId);

        final InputMethodSettings settings = new InputMethodSettings(methodMap, mUserId);

        for (final InputMethodInfo imi : settings.getEnabledInputMethodListLocked()) {

            if (!imi.shouldShowInInputMethodPicker()) {

                continue;

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ import com.android.server.companion.virtual.VirtualDeviceManagerInternal; 
import com.android.server.input.InputManagerInternal;

import com.android.server.inputmethod.InputMethodManagerInternal.InputMethodListListener;

import com.android.server.inputmethod.InputMethodSubtypeSwitchingController.ImeSubtypeListItem;

import com.android.server.inputmethod.InputMethodUtils.InputMethodSettings;

import com.android.server.pm.UserManagerInternal;

import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.utils.PriorityDump;

services/core/java/com/android/server/inputmethod/InputMethodSettings.java

0 → 100644
+686 −0

File added.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.view.inputmethod.InputMethodInfo; 
import android.view.inputmethod.InputMethodSubtype;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.inputmethod.InputMethodUtils.InputMethodSettings;



import java.util.ArrayList;

import java.util.Collections;

services/core/java/com/android/server/inputmethod/InputMethodUtils.java

+2 −644

File changed.

Preview size limit exceeded, changes collapsed.