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

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

Merge "Unextract getExplicitlyOrImplicitlyEnabledInputMethodsAndSubtypeListLocked()"

parents a18cb5a1 7eee1815

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

+8 −11
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.server.inputmethod.InputMethodUtils.InputMethodSettings; 


import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Locale;
@@ -184,11 +183,8 @@ final class InputMethodSubtypeSwitchingController { 


        public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeList(

                boolean includeAuxiliarySubtypes, boolean isScreenLocked) {

            final ArrayList<ImeSubtypeListItem> imList = new ArrayList<>();

            final HashMap<InputMethodInfo, List<InputMethodSubtype>> immis =

                    mSettings.getExplicitlyOrImplicitlyEnabledInputMethodsAndSubtypeListLocked(

                            mContext);

            if (immis == null || immis.size() == 0) {

            final ArrayList<InputMethodInfo> imis = mSettings.getEnabledInputMethodListLocked();

            if (imis.isEmpty()) {

                return Collections.emptyList();

            }

            if (isScreenLocked && includeAuxiliarySubtypes) {
@@ -197,11 +193,12 @@ final class InputMethodSubtypeSwitchingController { 
                }

                includeAuxiliarySubtypes = false;

            }

            for (InputMethodInfo imi : immis.keySet()) {

                if (imi == null) {

                    continue;

                }

                List<InputMethodSubtype> explicitlyOrImplicitlyEnabledSubtypeList = immis.get(imi);

            final ArrayList<ImeSubtypeListItem> imList = new ArrayList<>();

            final int numImes = imis.size();

            for (int i = 0; i < numImes; ++i) {

                final InputMethodInfo imi = imis.get(i);

                final List<InputMethodSubtype> explicitlyOrImplicitlyEnabledSubtypeList =

                        mSettings.getEnabledInputMethodSubtypeListLocked(mContext, imi, true);

                HashSet<String> enabledSubtypeSet = new HashSet<>();

                for (InputMethodSubtype subtype : explicitlyOrImplicitlyEnabledSubtypeList) {

                    enabledSubtypeSet.add(String.valueOf(subtype.hashCode()));

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

+0 −11
Original line number Diff line number Diff line
@@ -1277,17 +1277,6 @@ final class InputMethodUtils { 
            }

        }



        public HashMap<InputMethodInfo, List<InputMethodSubtype>>

                getExplicitlyOrImplicitlyEnabledInputMethodsAndSubtypeListLocked(Context context) {

            HashMap<InputMethodInfo, List<InputMethodSubtype>> enabledInputMethodAndSubtypes =

                    new HashMap<>();

            for (InputMethodInfo imi: getEnabledInputMethodListLocked()) {

                enabledInputMethodAndSubtypes.put(

                        imi, getEnabledInputMethodSubtypeListLocked(context, imi, true));

            }

            return enabledInputMethodAndSubtypes;

        }



        public void dumpLocked(final Printer pw, final String prefix) {

            pw.println(prefix + "mCurrentUserId=" + mCurrentUserId);

            pw.println(prefix + "mCurrentProfileIds=" + Arrays.toString(mCurrentProfileIds));