diff options
Diffstat (limited to 'java/src/com/android/inputmethod/voice')
3 files changed, 21 insertions, 18 deletions
diff --git a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java index 7ad6c35a0..2052d9348 100644 --- a/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java +++ b/java/src/com/android/inputmethod/voice/VoiceIMEConnector.java @@ -16,8 +16,7 @@ package com.android.inputmethod.voice; -import com.android.inputmethod.keyboard.KeyboardSwitcher; -import com.android.inputmethod.latin.EditingUtil; +import com.android.inputmethod.latin.EditingUtils; import com.android.inputmethod.latin.LatinIME; import com.android.inputmethod.latin.LatinIME.UIHandler; import com.android.inputmethod.latin.R; @@ -133,6 +132,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { } private VoiceIMEConnector() { + // Intentional empty constructor for singleton. } public void resetVoiceStates(boolean isPasswordText) { @@ -228,7 +228,8 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { } private static class CustomLinkMovementMethod extends LinkMovementMethod { - private static CustomLinkMovementMethod sInstance = new CustomLinkMovementMethod(); + private static CustomLinkMovementMethod sLinkMovementMethodInstance = + new CustomLinkMovementMethod(); private AlertDialog mAlertDialog; public void setVoiceWarningDialog(AlertDialog alertDialog) { @@ -236,7 +237,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { } public static CustomLinkMovementMethod getInstance() { - return sInstance; + return sLinkMovementMethodInstance; } // Almost the same as LinkMovementMethod.onTouchEvent(), but overrides it for @@ -391,9 +392,8 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { public void rememberReplacedWord(CharSequence suggestion,String wordSeparators) { if (mShowingVoiceSuggestions) { // Retain the replaced word in the alternatives array. - EditingUtil.Range range = new EditingUtil.Range(); - String wordToBeReplaced = EditingUtil.getWordAtCursor( - mContext.getCurrentInputConnection(), wordSeparators, range); + String wordToBeReplaced = EditingUtils.getWordAtCursor( + mContext.getCurrentInputConnection(), wordSeparators); if (!mWordToSuggestions.containsKey(wordToBeReplaced)) { wordToBeReplaced = wordToBeReplaced.toLowerCase(); } @@ -415,9 +415,9 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { * @param touching The word that the cursor is touching, with position information * @return true if an alternative was found, false otherwise. */ - public boolean applyVoiceAlternatives(EditingUtil.SelectedWord touching) { + public boolean applyVoiceAlternatives(EditingUtils.SelectedWord touching) { // Search for result in spoken word alternatives - String selectedWord = touching.word.toString().trim(); + String selectedWord = touching.mWord.toString().trim(); if (!mWordToSuggestions.containsKey(selectedWord)) { selectedWord = selectedWord.toLowerCase(); } @@ -426,7 +426,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { List<CharSequence> suggestions = mWordToSuggestions.get(selectedWord); // If the first letter of touching is capitalized, make all the suggestions // start with a capital letter. - if (Character.isUpperCase(touching.word.charAt(0))) { + if (Character.isUpperCase(touching.mWord.charAt(0))) { for (int i = 0; i < suggestions.size(); i++) { String origSugg = (String) suggestions.get(i); String capsSugg = origSugg.toUpperCase().charAt(0) @@ -478,7 +478,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { } - public void handleVoiceResults(KeyboardSwitcher switcher, boolean capitalizeFirstWord) { + public void handleVoiceResults(boolean capitalizeFirstWord) { mAfterVoiceInput = true; mImmediatelyAfterVoiceInput = true; @@ -508,7 +508,7 @@ public class VoiceIMEConnector implements VoiceInput.UiListener { if (ic != null) ic.beginBatchEdit(); // To avoid extra updates on committing older text mContext.commitTyped(ic); - EditingUtil.appendText(ic, bestResult); + EditingUtils.appendText(ic, bestResult); if (ic != null) ic.endBatchEdit(); mVoiceInputHighlighted = true; diff --git a/java/src/com/android/inputmethod/voice/VoiceInput.java b/java/src/com/android/inputmethod/voice/VoiceInput.java index d51d8694d..f77b4dd0d 100644 --- a/java/src/com/android/inputmethod/voice/VoiceInput.java +++ b/java/src/com/android/inputmethod/voice/VoiceInput.java @@ -16,7 +16,7 @@ package com.android.inputmethod.voice; -import com.android.inputmethod.latin.EditingUtil; +import com.android.inputmethod.latin.EditingUtils; import com.android.inputmethod.latin.R; import android.content.ContentResolver; @@ -241,7 +241,7 @@ public class VoiceInput implements OnClickListener { } public void incrementTextModificationInsertPunctuationCount(int count){ - mAfterVoiceInputInsertPunctuationCount += 1; + mAfterVoiceInputInsertPunctuationCount += count; if (mAfterVoiceInputSelectionSpan > 0) { // If text was highlighted before inserting the char, count this as // a delete. @@ -429,8 +429,7 @@ public class VoiceInput implements OnClickListener { public void logTextModifiedByChooseSuggestion(String suggestion, int index, String wordSeparators, InputConnection ic) { - EditingUtil.Range range = new EditingUtil.Range(); - String wordToBeReplaced = EditingUtil.getWordAtCursor(ic, wordSeparators, range); + String wordToBeReplaced = EditingUtils.getWordAtCursor(ic, wordSeparators); // If we enable phrase-based alternatives, only send up the first word // in suggestion and wordToBeReplaced. mLogger.textModifiedByChooseSuggestion(suggestion.length(), wordToBeReplaced.length(), @@ -578,7 +577,9 @@ public class VoiceInput implements OnClickListener { public void onBufferReceived(byte[] buf) { try { mWaveBuffer.write(buf); - } catch (IOException e) {} + } catch (IOException e) { + // ignore. + } } @Override diff --git a/java/src/com/android/inputmethod/voice/WaveformImage.java b/java/src/com/android/inputmethod/voice/WaveformImage.java index 08d87c8f3..8bac669fc 100644 --- a/java/src/com/android/inputmethod/voice/WaveformImage.java +++ b/java/src/com/android/inputmethod/voice/WaveformImage.java @@ -33,7 +33,9 @@ import java.nio.ShortBuffer; public class WaveformImage { private static final int SAMPLING_RATE = 8000; - private WaveformImage() {} + private WaveformImage() { + // Intentional empty constructor. + } public static Bitmap drawWaveform( ByteArrayOutputStream waveBuffer, int w, int h, int start, int end) { |