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

Commit 7025964d authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Apply Java 7 diamond operator. 

This is a mechanical refactoring to apply Java 7 diamond operators in
InputMethodSubtypeSwitchingController.java.

Bug: 22859862
Change-Id: If80df0bcf0b1485c43d55ff51cab69c8ae211eb2
parent e512f850

core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java

+3 −4
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class InputMethodSubtypeSwitchingController { 
        }



        private final TreeMap<InputMethodInfo, List<InputMethodSubtype>> mSortedImmis =

                new TreeMap<InputMethodInfo, List<InputMethodSubtype>>(

                new TreeMap<>(

                        new Comparator<InputMethodInfo>() {

                            @Override

                            public int compare(InputMethodInfo imi1, InputMethodInfo imi2) {
@@ -194,8 +194,7 @@ public class InputMethodSubtypeSwitchingController { 


        public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeList(

                boolean includeAuxiliarySubtypes, boolean isScreenLocked) {

            final ArrayList<ImeSubtypeListItem> imList =

                    new ArrayList<ImeSubtypeListItem>();

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

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

                    mSettings.getExplicitlyOrImplicitlyEnabledInputMethodsAndSubtypeListLocked(

                            mContext);
@@ -215,7 +214,7 @@ public class InputMethodSubtypeSwitchingController { 
                    continue;

                }

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

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

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

                for (InputMethodSubtype subtype : explicitlyOrImplicitlyEnabledSubtypeList) {

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

                }