am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
* commit 'f1dcf725061b3e61e40540566a5385cf4934f424': Don't process recorrection or resets when not shownmain
commit
ce3b16a2f1
|
@ -90,7 +90,7 @@ import java.util.TreeSet;
|
|||
/**
|
||||
* Input method implementation for Qwerty'ish keyboard.
|
||||
*/
|
||||
public final class LatinIME extends InputMethodService implements KeyboardActionListener,
|
||||
public class LatinIME extends InputMethodService implements KeyboardActionListener,
|
||||
SuggestionStripView.Listener, TargetApplicationGetter.OnTargetApplicationKnownListener,
|
||||
Suggest.SuggestInitializationListener {
|
||||
private static final String TAG = LatinIME.class.getSimpleName();
|
||||
|
@ -188,6 +188,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
// Keeps track of most recently inserted text (multi-character key) for reverting
|
||||
private String mEnteredText;
|
||||
|
||||
// TODO: This boolean is persistent state and causes large side effects at unexpected times.
|
||||
// Find a way to remove it for readability.
|
||||
private boolean mIsAutoCorrectionIndicatorOn;
|
||||
|
||||
private AlertDialog mOptionsDialog;
|
||||
|
@ -902,7 +904,12 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
// we know for sure the cursor moved while we were composing and we should reset
|
||||
// the state.
|
||||
final boolean noComposingSpan = composingSpanStart == -1 && composingSpanEnd == -1;
|
||||
if (!mExpectingUpdateSelection
|
||||
// If the keyboard is not visible, we don't need to do all the housekeeping work, as it
|
||||
// will be reset when the keyboard shows up anyway.
|
||||
// TODO: revisit this when LatinIME supports hardware keyboards.
|
||||
// NOTE: the test harness subclasses LatinIME and overrides isInputViewShown().
|
||||
// TODO: find a better way to simulate actual execution.
|
||||
if (isInputViewShown() && !mExpectingUpdateSelection
|
||||
&& !mConnection.isBelatedExpectedUpdate(oldSelStart, newSelStart)) {
|
||||
// TAKE CARE: there is a race condition when we enter this test even when the user
|
||||
// did not explicitly move the cursor. This happens when typing fast, where two keys
|
||||
|
@ -2507,7 +2514,10 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
|
||||
// Note that it's very important here that suggestedWords.mWillAutoCorrect is false.
|
||||
// We never want to auto-correct on a resumed suggestion. Please refer to the three
|
||||
// places above where suggestedWords is affected.
|
||||
// places above where suggestedWords is affected. We also need to reset
|
||||
// mIsAutoCorrectionIndicatorOn to avoid showSuggestionStrip touching the text to adapt it.
|
||||
// TODO: remove mIsAutoCorrectionIndicator on (see comment on definition)
|
||||
mIsAutoCorrectionIndicatorOn = false;
|
||||
showSuggestionStrip(suggestedWords, typedWord);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
public class InputTestsBase extends ServiceTestCase<LatinIME> {
|
||||
public class InputTestsBase extends ServiceTestCase<LatinIMEForTests> {
|
||||
|
||||
private static final String PREF_DEBUG_MODE = "debug_mode";
|
||||
|
||||
|
@ -121,7 +121,7 @@ public class InputTestsBase extends ServiceTestCase<LatinIME> {
|
|||
}
|
||||
|
||||
public InputTestsBase() {
|
||||
super(LatinIME.class);
|
||||
super(LatinIMEForTests.class);
|
||||
}
|
||||
|
||||
// TODO: Isn't there a way to make this generic somehow? We can take a <T> and return a <T>
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* Copyright (C) 2013 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.inputmethod.latin;
|
||||
|
||||
public class LatinIMEForTests extends LatinIME {
|
||||
@Override
|
||||
public boolean isInputViewShown() {
|
||||
return true;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue