nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Cleanup unused variables and parameters"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-12-15 18:02:38 -08:00 committed by Android (Google) Code Review
commit e9a0efc242
10 changed files with 40 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
View file

@ -17,7 +17,6 @@
package com.android.inputmethod.accessibility;
import android.content.Context;
import android.content.SharedPreferences;
import android.inputmethodservice.InputMethodService;
import android.media.AudioManager;
import android.os.SystemClock;
@ -55,15 +54,15 @@ public class AccessibilityUtils {
*/
private static final boolean ENABLE_ACCESSIBILITY = true;
public static void init(InputMethodService inputMethod, SharedPreferences prefs) {
public static void init(InputMethodService inputMethod) {
if (!ENABLE_ACCESSIBILITY)
return;
// These only need to be initialized if the kill switch is off.
sInstance.initInternal(inputMethod, prefs);
KeyCodeDescriptionMapper.init(inputMethod, prefs);
AccessibleInputMethodServiceProxy.init(inputMethod, prefs);
AccessibleKeyboardViewProxy.init(inputMethod, prefs);
sInstance.initInternal(inputMethod);
KeyCodeDescriptionMapper.init();
AccessibleInputMethodServiceProxy.init(inputMethod);
AccessibleKeyboardViewProxy.init(inputMethod);
}
public static AccessibilityUtils getInstance() {
@ -74,7 +73,7 @@ public class AccessibilityUtils {
// This class is not publicly instantiable.
}
private void initInternal(Context context, SharedPreferences prefs) {
private void initInternal(Context context) {
mContext = context;
mAccessibilityManager = (AccessibilityManager) context
.getSystemService(Context.ACCESSIBILITY_SERVICE);

9
java/src/com/android/inputmethod/accessibility/AccessibleInputMethodServiceProxy.java
View file

@ -17,7 +17,6 @@
package com.android.inputmethod.accessibility;
import android.content.Context;
import android.content.SharedPreferences;
import android.inputmethodservice.InputMethodService;
import android.media.AudioManager;
import android.os.Looper;
@ -82,8 +81,8 @@ public class AccessibleInputMethodServiceProxy implements AccessibleKeyboardActi
}
}
public static void init(InputMethodService inputMethod, SharedPreferences prefs) {
sInstance.initInternal(inputMethod, prefs);
public static void init(InputMethodService inputMethod) {
sInstance.initInternal(inputMethod);
}
public static AccessibleInputMethodServiceProxy getInstance() {
@ -94,7 +93,7 @@ public class AccessibleInputMethodServiceProxy implements AccessibleKeyboardActi
// Not publicly instantiable.
}
private void initInternal(InputMethodService inputMethod, SharedPreferences prefs) {
private void initInternal(InputMethodService inputMethod) {
mInputMethod = inputMethod;
mVibrator = (Vibrator) inputMethod.getSystemService(Context.VIBRATOR_SERVICE);
mAudioManager = (AudioManager) inputMethod.getSystemService(Context.AUDIO_SERVICE);
@ -125,8 +124,6 @@ public class AccessibleInputMethodServiceProxy implements AccessibleKeyboardActi
*/
@Override
public void onFlickGesture(int direction) {
final int keyEventCode;
switch (direction) {
case FlickGestureDetector.FLICK_LEFT:
sendDownUpKeyEvents(KeyEvent.KEYCODE_DPAD_LEFT);

16
java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java
View file

@ -17,7 +17,6 @@
package com.android.inputmethod.accessibility;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.Paint;
import android.inputmethodservice.InputMethodService;
@ -43,8 +42,8 @@ public class AccessibleKeyboardViewProxy {
private Key mLastHoverKey = null;
public static void init(InputMethodService inputMethod, SharedPreferences prefs) {
sInstance.initInternal(inputMethod, prefs);
public static void init(InputMethodService inputMethod) {
sInstance.initInternal(inputMethod);
sInstance.mListener = AccessibleInputMethodServiceProxy.getInstance();
}
@ -60,7 +59,7 @@ public class AccessibleKeyboardViewProxy {
// Not publicly instantiable.
}
private void initInternal(InputMethodService inputMethod, SharedPreferences prefs) {
private void initInternal(InputMethodService inputMethod) {
final Paint paint = new Paint();
paint.setTextAlign(Paint.Align.LEFT);
paint.setTextSize(14.0f);
@ -71,8 +70,7 @@ public class AccessibleKeyboardViewProxy {
mGestureDetector = new KeyboardFlickGestureDetector(inputMethod);
}
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event,
PointerTracker tracker) {
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
if (mView == null) {
Log.e(TAG, "No keyboard view set!");
return false;
@ -132,9 +130,9 @@ public class AccessibleKeyboardViewProxy {
final Key key = tracker.getKeyOn(x, y);
if (key != mLastHoverKey) {
fireKeyHoverEvent(tracker, mLastHoverKey, false);
fireKeyHoverEvent(mLastHoverKey, false);
mLastHoverKey = key;
fireKeyHoverEvent(tracker, mLastHoverKey, true);
fireKeyHoverEvent(mLastHoverKey, true);
}
return true;
@ -143,7 +141,7 @@ public class AccessibleKeyboardViewProxy {
return false;
}
private void fireKeyHoverEvent(PointerTracker tracker, Key key, boolean entering) {
private void fireKeyHoverEvent(Key key, boolean entering) {
if (mListener == null) {
Log.e(TAG, "No accessible keyboard action listener set!");
return;

1
java/src/com/android/inputmethod/accessibility/FlickGestureDetector.java
View file

@ -126,7 +126,6 @@ public abstract class FlickGestureDetector {
}
final float distanceSquare = calculateDistanceSquare(mCachedHoverEnter, event);
final long timeout = event.getEventTime() - mCachedHoverEnter.getEventTime();
switch (event.getAction()) {
case MotionEventCompatUtils.ACTION_HOVER_MOVE:

7
java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
View file

@ -17,7 +17,6 @@
package com.android.inputmethod.accessibility;
import android.content.Context;
import android.content.SharedPreferences;
import android.text.TextUtils;
import com.android.inputmethod.keyboard.Key;
@ -45,8 +44,8 @@ public class KeyCodeDescriptionMapper {
// Map of shift-locked key codes to spoken description resource IDs
private final HashMap<Integer, Integer> mShiftLockedKeyCodeMap;
public static void init(Context context, SharedPreferences prefs) {
sInstance.initInternal(context, prefs);
public static void init() {
sInstance.initInternal();
}
public static KeyCodeDescriptionMapper getInstance() {
@ -60,7 +59,7 @@ public class KeyCodeDescriptionMapper {
mShiftLockedKeyCodeMap = new HashMap<Integer, Integer>();
}
private void initInternal(Context context, SharedPreferences prefs) {
private void initInternal() {
// Manual label substitutions for key labels with no string resource
mKeyLabelMap.put(":-)", R.string.spoken_description_smiley);

8
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View file

@ -206,7 +206,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
// Detected a double tap on shift key. If we are in the ignoring double tap
// mode, it means we have already turned off caps lock in
// {@link KeyboardSwitcher#onReleaseShift} .
onDoubleTapShiftKey(tracker, mKeyTimerHandler.isIgnoringDoubleTap());
onDoubleTapShiftKey(mKeyTimerHandler.isIgnoringDoubleTap());
return true;
}
// Otherwise these events should not be handled as double tap.
@ -342,8 +342,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
return onLongPress(parentKey, tracker);
}
private void onDoubleTapShiftKey(@SuppressWarnings("unused") PointerTracker tracker,
final boolean ignore) {
private void onDoubleTapShiftKey(final boolean ignore) {
// When shift key is double tapped, the first tap is correctly processed as usual tap. And
// the second tap is treated as this double tap event, so that we need not mark tracker
// calling setAlreadyProcessed() nor remove the tracker from mPointerQueue.
@ -624,9 +623,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
@Override
public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
final PointerTracker tracker = getPointerTracker(0);
return AccessibleKeyboardViewProxy.getInstance().dispatchPopulateAccessibilityEvent(
event, tracker) || super.dispatchPopulateAccessibilityEvent(event);
event) || super.dispatchPopulateAccessibilityEvent(event);
}
return super.dispatchPopulateAccessibilityEvent(event);

6
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -498,7 +498,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
InputMethodManagerCompatWrapper.init(this);
SubtypeSwitcher.init(this);
KeyboardSwitcher.init(this, prefs);
AccessibilityUtils.init(this, prefs);
AccessibilityUtils.init(this);
super.onCreate();
@ -767,7 +767,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
loadSettings();
updateCorrectionMode();
updateSuggestionVisibility(mPrefs, mResources);
updateSuggestionVisibility(mResources);
if (mSuggest != null && mSettingsValues.mAutoCorrectEnabled) {
mSuggest.setAutoCorrectionThreshold(mSettingsValues.mAutoCorrectionThreshold);
@ -2424,7 +2424,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
? Suggest.CORRECTION_FULL_BIGRAM : mCorrectionMode;
}
private void updateSuggestionVisibility(final SharedPreferences prefs, final Resources res) {
private void updateSuggestionVisibility(final Resources res) {
final String suggestionVisiblityStr = mSettingsValues.mShowSuggestionsSetting;
for (int visibility : SUGGESTION_VISIBILITY_VALUE_ARRAY) {
if (suggestionVisiblityStr.equals(res.getString(visibility))) {

21
java/src/com/android/inputmethod/latin/SettingsValues.java
View file

@ -52,7 +52,9 @@ public class SettingsValues {
private final String mVoiceMode;
private final String mAutoCorrectionThresholdRawValue;
public final String mShowSuggestionsSetting;
@SuppressWarnings("unused") // TODO: Use this
private final boolean mUsabilityStudyMode;
@SuppressWarnings("unused") // TODO: Use this
private final String mKeyPreviewPopupDismissDelayRawValue;
public final boolean mUseContactsDict;
// Suggestion: use bigrams to adjust scores of suggestions obtained from unigram dictionary
@ -60,7 +62,9 @@ public class SettingsValues {
// Prediction: use bigrams to predict the next word when there is no input for it yet
public final boolean mBigramPredictionEnabled;
public final boolean mEnableSuggestionSpanInsertion;
@SuppressWarnings("unused") // TODO: Use this
private final int mVibrationDurationSettingsRawValue;
@SuppressWarnings("unused") // TODO: Use this
private final float mKeypressSoundVolumeRawValue;
// Deduced settings
@ -111,12 +115,12 @@ public class SettingsValues {
res.getString(R.string.auto_correction_threshold_mode_index_modest));
mShowSuggestionsSetting = prefs.getString(Settings.PREF_SHOW_SUGGESTIONS_SETTING,
res.getString(R.string.prefs_suggestion_visibility_default_value));
mUsabilityStudyMode = getUsabilityStudyMode(prefs, res);
mUsabilityStudyMode = getUsabilityStudyMode(prefs);
mKeyPreviewPopupDismissDelayRawValue = prefs.getString(
Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY,
Integer.toString(res.getInteger(R.integer.config_delay_after_preview)));
mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
mAutoCorrectEnabled = isAutoCorrectEnabled(prefs, res, mAutoCorrectionThresholdRawValue);
mAutoCorrectEnabled = isAutoCorrectEnabled(res, mAutoCorrectionThresholdRawValue);
mBigramSuggestionEnabled = mAutoCorrectEnabled
&& isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled);
mBigramPredictionEnabled = mBigramSuggestionEnabled
@ -131,7 +135,7 @@ public class SettingsValues {
mKeypressVibrationDuration = getCurrentVibrationDuration(prefs, res);
mFxVolume = getCurrentKeypressSoundVolume(prefs, res);
mKeyPreviewPopupDismissDelay = getKeyPreviewPopupDismissDelay(prefs, res);
mAutoCorrectionThreshold = getAutoCorrectionThreshold(prefs, res,
mAutoCorrectionThreshold = getAutoCorrectionThreshold(res,
mAutoCorrectionThresholdRawValue);
mVoiceKeyEnabled = mVoiceMode != null && !mVoiceMode.equals(voiceModeOff);
mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain);
@ -202,8 +206,8 @@ public class SettingsValues {
return mMagicSpaceSwappers.contains(String.valueOf((char)code));
}
private static boolean isAutoCorrectEnabled(final SharedPreferences sp,
final Resources resources, final String currentAutoCorrectionSetting) {
private static boolean isAutoCorrectEnabled(final Resources resources,
final String currentAutoCorrectionSetting) {
final String autoCorrectionOff = resources.getString(
R.string.auto_correction_threshold_mode_index_off);
return !currentAutoCorrectionSetting.equals(autoCorrectionOff);
@ -244,8 +248,8 @@ public class SettingsValues {
R.bool.config_default_bigram_prediction));
}
private static double getAutoCorrectionThreshold(final SharedPreferences sp,
final Resources resources, final String currentAutoCorrectionSetting) {
private static double getAutoCorrectionThreshold(final Resources resources,
final String currentAutoCorrectionSetting) {
final String[] autoCorrectionThresholdValues = resources.getStringArray(
R.array.auto_correction_threshold_values);
// When autoCorrectionThreshold is greater than 1.0, it's like auto correction is off.
@ -321,8 +325,7 @@ public class SettingsValues {
}
// Likewise
public static boolean getUsabilityStudyMode(final SharedPreferences prefs,
final Resources res) {
public static boolean getUsabilityStudyMode(final SharedPreferences prefs) {
// TODO: use mUsabilityStudyMode instead of reading it again here
return prefs.getBoolean(Settings.PREF_USABILITY_STUDY_MODE, true);
}

7
java/src/com/android/inputmethod/latin/SuggestionsView.java
View file

@ -100,8 +100,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
private static class UiHandler extends StaticInnerHandlerWrapper<SuggestionsView> {
private static final int MSG_HIDE_PREVIEW = 0;
private static final long DELAY_HIDE_PREVIEW = 1300;
public UiHandler(SuggestionsView outerInstance) {
super(outerInstance);
}
@ -116,11 +114,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
}
}
public void postHidePreview() {
cancelHidePreview();
sendMessageDelayed(obtainMessage(MSG_HIDE_PREVIEW), DELAY_HIDE_PREVIEW);
}
public void cancelHidePreview() {
removeMessages(MSG_HIDE_PREVIEW);
}

6
java/src/com/android/inputmethod/latin/UserUnigramDictionary.java
View file

@ -172,7 +172,7 @@ public class UserUnigramDictionary extends ExpandableDictionary {
// Nothing pending? Return
if (mPendingWrites.isEmpty()) return;
// Create a background thread to write the pending entries
new UpdateDbTask(getContext(), sOpenHelper, mPendingWrites, mLocale).execute();
new UpdateDbTask(sOpenHelper, mPendingWrites, mLocale).execute();
// Create a new map for writing new entries into while the old one is written to db
mPendingWrites = new HashMap<String, Integer>();
}
@ -227,8 +227,8 @@ public class UserUnigramDictionary extends ExpandableDictionary {
private final DatabaseHelper mDbHelper;
private final String mLocale;
public UpdateDbTask(@SuppressWarnings("unused") Context context, DatabaseHelper openHelper,
HashMap<String, Integer> pendingWrites, String locale) {
public UpdateDbTask(DatabaseHelper openHelper, HashMap<String, Integer> pendingWrites,
String locale) {
mMap = pendingWrites;
mLocale = locale;
mDbHelper = openHelper;