am 529cdf0a: Merge "[IL20] Remove some useless processing."

* commit '529cdf0a0c32c9a5264e4c6f00b246a5a8c20190':
  [IL20] Remove some useless processing.
main
Jean Chalard 2013-12-19 23:17:12 -08:00 committed by Android Git Automerger
commit 3632e82789
1 changed files with 7 additions and 8 deletions

View File

@ -732,14 +732,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
Log.w(TAG, "Use EditorInfo.IME_FLAG_FORCE_ASCII flag instead"); Log.w(TAG, "Use EditorInfo.IME_FLAG_FORCE_ASCII flag instead");
} }
final PackageInfo packageInfo =
TargetPackageInfoGetterTask.getCachedPackageInfo(editorInfo.packageName);
mAppWorkAroundsUtils.setPackageInfo(packageInfo);
if (null == packageInfo) {
new TargetPackageInfoGetterTask(this /* context */, this /* listener */)
.execute(editorInfo.packageName);
}
LatinImeLogger.onStartInputView(editorInfo); LatinImeLogger.onStartInputView(editorInfo);
// In landscape mode, this method gets called without the input view being created. // In landscape mode, this method gets called without the input view being created.
if (mainKeyboardView == null) { if (mainKeyboardView == null) {
@ -806,6 +798,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (isDifferentTextField) { if (isDifferentTextField) {
mainKeyboardView.closing(); mainKeyboardView.closing();
loadSettings(); 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(); currentSettingsValues = mSettings.getCurrent();
if (suggest != null && currentSettingsValues.mCorrectionEnabled) { if (suggest != null && currentSettingsValues.mCorrectionEnabled) {