diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-23 16:44:51 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 16:44:51 +0000 |
| commit | 3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c (patch) | |
| tree | 0ceda5aefb24fa3ffa8e52e3d1f8a8757f27296e /java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java | |
| parent | cf4884c5a79e9260a82e7d4ed0eac264f987c230 (diff) | |
| parent | 6726bc90014c8d9c1710e4b52aa019d3e945f407 (diff) | |
| download | latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.tar.gz latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.tar.xz latinime-3b500f7bd1bbe4cf2836ea4cc5e676bb2da7345c.zip | |
am 6726bc90: Merge "Use Java 7 diamond operator"
* commit '6726bc90014c8d9c1710e4b52aa019d3e945f407':
Use Java 7 diamond operator
Diffstat (limited to 'java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java b/java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java index 1ffe50681..b33739fc1 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/DictAndKeyboard.java @@ -16,11 +16,11 @@ package com.android.inputmethod.latin.spellcheck; -import com.android.inputmethod.latin.Dictionary; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardId; import com.android.inputmethod.keyboard.KeyboardLayoutSet; import com.android.inputmethod.keyboard.ProximityInfo; +import com.android.inputmethod.latin.Dictionary; /** * A container for a Dictionary and a Keyboard. @@ -28,19 +28,15 @@ import com.android.inputmethod.keyboard.ProximityInfo; public final class DictAndKeyboard { public final Dictionary mDictionary; public final Keyboard mKeyboard; - private final Keyboard mManualShiftedKeyboard; public DictAndKeyboard( final Dictionary dictionary, final KeyboardLayoutSet keyboardLayoutSet) { mDictionary = dictionary; if (keyboardLayoutSet == null) { mKeyboard = null; - mManualShiftedKeyboard = null; return; } mKeyboard = keyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET); - mManualShiftedKeyboard = - keyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED); } public ProximityInfo getProximityInfo() { |