aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-08-20 15:52:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-20 15:52:48 +0000
commitb8337e7232693b848fe7559050bf427f74b98fbe (patch)
tree7b2f97e58335b3bfb12685a8e1d8d3749456bd48 /java/src
parentcdc260b78ed8d73b9e425ac55f3b5f9dab8bf753 (diff)
parent2834ddf1a0c9bea38569429f90bdf7526ba8fa22 (diff)
downloadlatinime-b8337e7232693b848fe7559050bf427f74b98fbe.tar.gz
latinime-b8337e7232693b848fe7559050bf427f74b98fbe.tar.xz
latinime-b8337e7232693b848fe7559050bf427f74b98fbe.zip
am 2834ddf1: am b9768702: Merge "Use #onStartInputInternal to initialize cursor rect retrieval" into lmp-dev
* commit '2834ddf1a0c9bea38569429f90bdf7526ba8fa22': Use #onStartInputInternal to initialize cursor rect retrieval
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8768e126e..b4d6ca736 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -420,18 +420,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (latinIme != null) {
executePendingImsCallback(latinIme, editorInfo, restarting);
latinIme.onStartInputInternal(editorInfo, restarting);
- if (ProductionFlags.ENABLE_CURSOR_RECT_CALLBACK) {
- InputConnectionCompatUtils.requestCursorRect(
- latinIme.getCurrentInputConnection(), true /* enableMonitor */);
- }
- if (ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK) {
- // AcceptTypedWord feature relies on CursorAnchorInfo.
- if (latinIme.mSettings.getCurrent().mShouldShowUiToAcceptTypedWord) {
- InputConnectionCompatUtils.requestCursorAnchorInfo(
- latinIme.getCurrentInputConnection(), true /* enableMonitor */,
- true /* requestImmediateCallback */);
- }
- }
}
}
}
@@ -766,6 +754,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void onStartInputInternal(final EditorInfo editorInfo, final boolean restarting) {
super.onStartInput(editorInfo, restarting);
+ if (ProductionFlags.ENABLE_CURSOR_RECT_CALLBACK) {
+ InputConnectionCompatUtils.requestCursorRect(getCurrentInputConnection(),
+ true /* enableMonitor */);
+ }
+ if (ProductionFlags.ENABLE_CURSOR_ANCHOR_INFO_CALLBACK) {
+ // AcceptTypedWord feature relies on CursorAnchorInfo.
+ if (mSettings.getCurrent().mShouldShowUiToAcceptTypedWord) {
+ InputConnectionCompatUtils.requestCursorAnchorInfo(
+ getCurrentInputConnection(), true /* enableMonitor */,
+ true /* requestImmediateCallback */);
+ }
+ }
}
@SuppressWarnings("deprecation")