Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply Java 7 diamond operator.

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

Bug: 22859862
Change-Id: If80df0bcf0b1485c43d55ff51cab69c8ae211eb2
This commit is contained in:
Yohei Yukawa
2015-12-10 01:04:06 -08:00
parent e512f85002
commit 7025964d12
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java
View File

@@ -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()));
}