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

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

Merge "Remove unused parameters from InputMethodSubtype#sort()"

parents 30f15ae1 1e8e36c0

core/java/android/view/inputmethod/InputMethodSubtype.java

+1 −3
Original line number Diff line number Diff line
@@ -666,14 +666,12 @@ public final class InputMethodSubtype implements Parcelable { 


    /**

     * Sort the list of InputMethodSubtype

     * @param context Context will be used for getting localized strings from IME

     * @param flags Flags for the sort order

     * @param imi InputMethodInfo of which subtypes are subject to be sorted

     * @param subtypeList List of InputMethodSubtype which will be sorted

     * @return Sorted list of subtypes

     * @hide

     */

    public static List<InputMethodSubtype> sort(Context context, int flags, InputMethodInfo imi,

    public static List<InputMethodSubtype> sort(InputMethodInfo imi,

            List<InputMethodSubtype> subtypeList) {

        if (imi == null) return subtypeList;

        final HashSet<InputMethodSubtype> inputSubtypesSet = new HashSet<InputMethodSubtype>(

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

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ final class InputMethodUtils { 
                enabledSubtypes = SubtypeUtils.getImplicitlyApplicableSubtypesLocked(

                        context.getResources(), imi);

            }

            return InputMethodSubtype.sort(context, 0, imi, enabledSubtypes);

            return InputMethodSubtype.sort(imi, enabledSubtypes);

        }



        List<InputMethodSubtype> getEnabledInputMethodSubtypeListLocked(InputMethodInfo imi) {