Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a11b97b4: Merge "Return the cursor position in screen coordinates"

Browse Source 
* commit 'a11b97b4c7fea2fb1c61fa74c217db789a0f9e54':
  Return the cursor position in screen coordinates
This commit is contained in:
Yohei Yukawa
2014-04-28 20:38:03 +00:00
committed by Android Git Automerger
parent 4e723047bc 985fd3063c
commit 2fe02f8a6e
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -255,7 +255,8 @@ public class InputMethodService extends AbstractInputMethodService {
public static final int CURSOR_ANCHOR_MONITOR_MODE_NONE = 0x0;
/**
* The IME expects that {@link #onUpdateCursor(Rect)} is called back.
* The IME will receive {@link #onUpdateCursor(Rect)} called back with the current
* cursor rectangle in screen coordinates.
*/
public static final int CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT = 0x1;
@@ -1703,9 +1704,11 @@ public class InputMethodService extends AbstractInputMethodService {
}
/**
* Called when the application has reported a new location of its text
* cursor. This is only called if explicitly requested by the input method.
* The default implementation does nothing.
* Called when the application has reported a new location of its text cursor. This is only
* called if explicitly requested by the input method. The default implementation does nothing.
* @param newCursor The new cursor position, in screen coordinates if the input method calls
* {@link #setCursorAnchorMonitorMode} with {@link #CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT}.
* Otherwise, this is in local coordinates.
*/
public void onUpdateCursor(Rect newCursor) {
// Intentionally empty

29
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -317,6 +317,10 @@ public final class InputMethodManager {
int mCursorSelEnd;
int mCursorCandStart;
int mCursorCandEnd;
/**
* The buffer to retrieve the view location in screen coordinates in {@link #updateCursor}.
*/
private final int[] mViewTopLeft = new int[2];
// -----------------------------------------------------------
@@ -1487,11 +1491,25 @@ public final class InputMethodManager {
return false;
}
synchronized (mH) {
return mCursorAnchorMonitorMode ==
InputMethodService.CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT;
return (mCursorAnchorMonitorMode &
InputMethodService.CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT) != 0;
}
}
/**
* Returns true if the current input method wants to receive the cursor rectangle in
* screen coordinates rather than local coordinates in the attached view.
*
* @hide
*/
public boolean usesScreenCoordinatesForCursorLocked() {
// {@link InputMethodService#CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT} also means
// that {@link InputMethodService#onUpdateCursor} should provide the cursor rectangle
// in screen coordinates rather than local coordinates.
return (mCursorAnchorMonitorMode &
InputMethodService.CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT) != 0;
}
/**
* Set cursor/anchor monitor mode via {@link com.android.server.InputMethodManagerService}.
* This is an internal method for {@link android.inputmethodservice.InputMethodService} and
@@ -1518,15 +1536,18 @@ public final class InputMethodManager {
|| mCurrentTextBoxAttribute == null || mCurMethod == null) {
return;
}
mTmpCursorRect.set(left, top, right, bottom);
if (!mCursorRect.equals(mTmpCursorRect)) {
if (DEBUG) Log.d(TAG, "updateCursor");
try {
if (DEBUG) Log.v(TAG, "CURSOR CHANGE: " + mCurMethod);
mCurMethod.updateCursor(mTmpCursorRect);
mCursorRect.set(mTmpCursorRect);
if (usesScreenCoordinatesForCursorLocked()) {
view.getLocationOnScreen(mViewTopLeft);
mTmpCursorRect.offset(mViewTopLeft[0], mViewTopLeft[1]);
}
mCurMethod.updateCursor(mTmpCursorRect);
} catch (RemoteException e) {
Log.w(TAG, "IME died: " + mCurId, e);
}