aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java85
1 files changed, 12 insertions, 73 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index a941dc3f4..f8909e86a 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -28,7 +28,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Rect;
@@ -61,7 +60,6 @@ import android.view.inputmethod.InputMethodSubtype;
import com.android.inputmethod.accessibility.AccessibilityUtils;
import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
import com.android.inputmethod.annotations.UsedForTesting;
-import com.android.inputmethod.compat.AppWorkaroundsUtils;
import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
import com.android.inputmethod.dictionarypack.DictionaryPackConstants;
import com.android.inputmethod.keyboard.Keyboard;
@@ -89,7 +87,6 @@ import com.android.inputmethod.latin.utils.IntentUtils;
import com.android.inputmethod.latin.utils.JniUtils;
import com.android.inputmethod.latin.utils.LatinImeLoggerUtils;
import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper;
-import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask;
import com.android.inputmethod.latin.utils.TextRange;
import com.android.inputmethod.research.ResearchLogger;
@@ -102,8 +99,7 @@ import java.util.Locale;
* Input method implementation for Qwerty'ish keyboard.
*/
public class LatinIME extends InputMethodService implements KeyboardActionListener,
- SuggestionStripView.Listener, TargetPackageInfoGetterTask.OnTargetPackageInfoKnownListener,
- Suggest.SuggestInitializationListener {
+ SuggestionStripView.Listener, Suggest.SuggestInitializationListener {
private static final String TAG = LatinIME.class.getSimpleName();
private static final boolean TRACE = false;
private static boolean DEBUG = false;
@@ -128,8 +124,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private SuggestionStripView mSuggestionStripView;
private CompletionInfo[] mApplicationSpecifiedCompletions;
- // TODO[IL]: Make this an AsyncResultHolder or a Future in SettingsValues
- public AppWorkaroundsUtils mAppWorkAroundsUtils = new AppWorkaroundsUtils();
private RichInputMethodManager mRichImm;
@UsedForTesting final KeyboardSwitcher mKeyboardSwitcher;
@@ -519,9 +513,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
@UsedForTesting
void loadSettings() {
final Locale locale = mSubtypeSwitcher.getCurrentSubtypeLocale();
- final InputAttributes inputAttributes =
- new InputAttributes(getCurrentInputEditorInfo(), isFullscreenMode());
- mSettings.loadSettings(locale, inputAttributes);
+ final EditorInfo editorInfo = getCurrentInputEditorInfo();
+ final InputAttributes inputAttributes = new InputAttributes(editorInfo, isFullscreenMode());
+ mSettings.loadSettings(this, locale, inputAttributes);
AudioAndHapticFeedbackManager.getInstance().onSettingsChanged(mSettings.getCurrent());
// To load the keyboard we need to load all the settings once, but resetting the
// contacts dictionary should be deferred until after the new layout has been displayed
@@ -798,13 +792,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (isDifferentTextField) {
mainKeyboardView.closing();
loadSettings();
- final PackageInfo packageInfo =
- TargetPackageInfoGetterTask.getCachedPackageInfo(editorInfo.packageName);
- mAppWorkAroundsUtils.setPackageInfo(packageInfo);
- if (null == packageInfo) {
- new TargetPackageInfoGetterTask(this /* context */, this /* listener */)
- .execute(editorInfo.packageName);
- }
currentSettingsValues = mSettings.getCurrent();
if (suggest != null && currentSettingsValues.mCorrectionEnabled) {
@@ -912,12 +899,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
}
- // Callback for the TargetPackageInfoGetterTask
- @Override
- public void onTargetPackageInfoKnown(final PackageInfo info) {
- mAppWorkAroundsUtils.setPackageInfo(info);
- }
-
@Override
public void onWindowHidden() {
super.onWindowHidden();
@@ -1321,35 +1302,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
// Called from PointerTracker through the KeyboardActionListener interface
- // TODO[IL]: Move this to InputLogic
@Override
public void onTextInput(final String rawText) {
- mInputLogic.mConnection.beginBatchEdit();
- if (mInputLogic.mWordComposer.isComposingWord()) {
- mInputLogic.commitCurrentAutoCorrection(mSettings.getCurrent(), rawText, mHandler);
- } else {
- mInputLogic.resetComposingState(true /* alsoResetLastComposedWord */);
- }
- mHandler.postUpdateSuggestionStrip();
- if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS
- && ResearchLogger.RESEARCH_KEY_OUTPUT_TEXT.equals(rawText)) {
- ResearchLogger.getInstance().onResearchKeySelected(this);
- return;
- }
- final String text = specificTldProcessingOnTextInput(rawText);
- if (SpaceState.PHANTOM == mInputLogic.mSpaceState) {
- mInputLogic.promotePhantomSpace(mSettings.getCurrent());
- }
- mInputLogic.mConnection.commitText(text, 1);
- if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
- ResearchLogger.latinIME_onTextInput(text, false /* isBatchMode */);
- }
- mInputLogic.mConnection.endBatchEdit();
- // Space state must be updated before calling updateShiftState
- mInputLogic.mSpaceState = SpaceState.NONE;
- mKeyboardSwitcher.updateShiftState();
- mKeyboardSwitcher.onCodeInput(Constants.CODE_OUTPUT_TEXT);
- mInputLogic.mEnteredText = text;
+ mInputLogic.onTextInput(mSettings.getCurrent(), rawText, mKeyboardSwitcher, mHandler);
}
@Override
@@ -1633,25 +1588,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mInputUpdater.onEndBatchInput(batchPointers);
}
- private String specificTldProcessingOnTextInput(final String text) {
- if (text.length() <= 1 || text.charAt(0) != Constants.CODE_PERIOD
- || !Character.isLetter(text.charAt(1))) {
- // Not a tld: do nothing.
- return text;
- }
- // We have a TLD (or something that looks like this): make sure we don't add
- // a space even if currently in phantom mode.
- mInputLogic.mSpaceState = SpaceState.NONE;
- // TODO: use getCodePointBeforeCursor instead to improve performance and simplify the code
- final CharSequence lastOne = mInputLogic.mConnection.getTextBeforeCursor(1, 0);
- if (lastOne != null && lastOne.length() == 1
- && lastOne.charAt(0) == Constants.CODE_PERIOD) {
- return text.substring(1);
- } else {
- return text;
- }
- }
-
// Called from PointerTracker through the KeyboardActionListener interface
@Override
public void onFinishSlidingInput() {
@@ -1991,12 +1927,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// HACK: We may want to special-case some apps that exhibit bad behavior in case of
// recorrection. This is a temporary, stopgap measure that will be removed later.
// TODO: remove this.
- if (mAppWorkAroundsUtils.isBrokenByRecorrection()) return;
+ final SettingsValues settingsValues = mSettings.getCurrent();
+ if (settingsValues.isBrokenByRecorrection()) return;
// A simple way to test for support from the TextView.
if (!isSuggestionsStripVisible()) return;
// Recorrection is not supported in languages without spaces because we don't know
// how to segment them yet.
- if (!mSettings.getCurrent().mCurrentLanguageHasSpaces) return;
+ if (!settingsValues.mCurrentLanguageHasSpaces) return;
// If the cursor is not touching a word, or if there is a selection, return right away.
if (mInputLogic.mLastSelectionStart != mInputLogic.mLastSelectionEnd) return;
// If we don't know the cursor location, return.
@@ -2322,8 +2259,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
public void debugDumpStateAndCrashWithException(final String context) {
- final StringBuilder s = new StringBuilder(mAppWorkAroundsUtils.toString());
- s.append("\nAttributes : ").append(mSettings.getCurrent().mInputAttributes)
+ final SettingsValues settingsValues = mSettings.getCurrent();
+ final StringBuilder s = new StringBuilder(settingsValues.toString());
+ s.append("\nAttributes : ").append(settingsValues.mInputAttributes)
.append("\nContext : ").append(context);
throw new RuntimeException(s.toString());
}
@@ -2348,5 +2286,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
p.println(" mVibrateOn=" + settingsValues.mVibrateOn);
p.println(" mKeyPreviewPopupOn=" + settingsValues.mKeyPreviewPopupOn);
p.println(" inputAttributes=" + settingsValues.mInputAttributes);
+ // TODO: Dump all settings values
}
}
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-07 06:52:56 +0000