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

Merge "Adjust touch position for handles using window coordinate." into nyc-dev

Browse Source
This commit is contained in:
Keisuke Kuroyanagi
2016-05-03 02:29:06 +00:00
committed by Android (Google) Code Review
parent 87a18d9e2b e2a3b1edd9
commit f2f8e65f98
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/widget/Editor.java
View File

@@ -2888,6 +2888,7 @@ public class Editor {
private boolean mPositionHasChanged = true; private boolean mPositionHasChanged = true;
// Absolute position of the TextView with respect to its parent window // Absolute position of the TextView with respect to its parent window
private int mPositionX, mPositionY; private int mPositionX, mPositionY;
private int mPositionXOnScreen, mPositionYOnScreen;
private int mNumberOfListeners; private int mNumberOfListeners;
private boolean mScrollHasChanged; private boolean mScrollHasChanged;
final int[] mTempCoords = new int[2]; final int[] mTempCoords = new int[2];
@@ -2937,6 +2938,14 @@ public class Editor {
return mPositionY; return mPositionY;
} }
public int getPositionXOnScreen() {
return mPositionXOnScreen;
}
public int getPositionYOnScreen() {
return mPositionYOnScreen;
}
@Override @Override
public boolean onPreDraw() { public boolean onPreDraw() {
updatePosition(); updatePosition();
@@ -2962,6 +2971,11 @@ public class Editor {
mPositionX = mTempCoords[0]; mPositionX = mTempCoords[0];
mPositionY = mTempCoords[1]; mPositionY = mTempCoords[1];
mTextView.getLocationOnScreen(mTempCoords);
mPositionXOnScreen = mTempCoords[0];
mPositionYOnScreen = mTempCoords[1];
} }
public void onScrollChanged() { public void onScrollChanged() {
@@ -3998,6 +4012,8 @@ public class Editor {
private float mIdealVerticalOffset; private float mIdealVerticalOffset;
// Parent's (TextView) previous position in window // Parent's (TextView) previous position in window
private int mLastParentX, mLastParentY; private int mLastParentX, mLastParentY;
// Parent's (TextView) previous position on screen
private int mLastParentXOnScreen, mLastParentYOnScreen;
// Previous text character offset // Previous text character offset
protected int mPreviousOffset = -1; protected int mPreviousOffset = -1;
// Previous text character offset // Previous text character offset
@@ -4236,6 +4252,7 @@ public class Editor {
return (int) (getHorizontal(layout, offset) - 0.5f); return (int) (getHorizontal(layout, offset) - 0.5f);
} }
@Override
public void updatePosition(int parentPositionX, int parentPositionY, public void updatePosition(int parentPositionX, int parentPositionY,
boolean parentPositionChanged, boolean parentScrolled) { boolean parentPositionChanged, boolean parentScrolled) {
positionAtCursorOffset(getCurrentCursorOffset(), parentScrolled); positionAtCursorOffset(getCurrentCursorOffset(), parentScrolled);
@@ -4312,24 +4329,30 @@ public class Editor {
switch (ev.getActionMasked()) { switch (ev.getActionMasked()) {
case MotionEvent.ACTION_DOWN: { case MotionEvent.ACTION_DOWN: {
startTouchUpFilter(getCurrentCursorOffset()); startTouchUpFilter(getCurrentCursorOffset());
mTouchToWindowOffsetX = ev.getRawX() - mPositionX;
mTouchToWindowOffsetY = ev.getRawY() - mPositionY;
final PositionListener positionListener = getPositionListener(); final PositionListener positionListener = getPositionListener();
mLastParentX = positionListener.getPositionX(); mLastParentX = positionListener.getPositionX();
mLastParentY = positionListener.getPositionY(); mLastParentY = positionListener.getPositionY();
mLastParentXOnScreen = positionListener.getPositionXOnScreen();
mLastParentYOnScreen = positionListener.getPositionYOnScreen();
final float xInWindow = ev.getRawX() - mLastParentXOnScreen + mLastParentX;
final float yInWindow = ev.getRawY() - mLastParentYOnScreen + mLastParentY;
mTouchToWindowOffsetX = xInWindow - mPositionX;
mTouchToWindowOffsetY = yInWindow - mPositionY;
mIsDragging = true; mIsDragging = true;
mPreviousLineTouched = UNSET_LINE; mPreviousLineTouched = UNSET_LINE;
break; break;
} }
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
final float rawX = ev.getRawX(); final float xInWindow = ev.getRawX() - mLastParentXOnScreen + mLastParentX;
final float rawY = ev.getRawY(); final float yInWindow = ev.getRawY() - mLastParentYOnScreen + mLastParentY;
// Vertical hysteresis: vertical down movement tends to snap to ideal offset // Vertical hysteresis: vertical down movement tends to snap to ideal offset
final float previousVerticalOffset = mTouchToWindowOffsetY - mLastParentY; final float previousVerticalOffset = mTouchToWindowOffsetY - mLastParentY;
final float currentVerticalOffset = rawY - mPositionY - mLastParentY; final float currentVerticalOffset = yInWindow - mPositionY - mLastParentY;
float newVerticalOffset; float newVerticalOffset;
if (previousVerticalOffset < mIdealVerticalOffset) { if (previousVerticalOffset < mIdealVerticalOffset) {
newVerticalOffset = Math.min(currentVerticalOffset, mIdealVerticalOffset); newVerticalOffset = Math.min(currentVerticalOffset, mIdealVerticalOffset);
@@ -4341,8 +4364,8 @@ public class Editor {
mTouchToWindowOffsetY = newVerticalOffset + mLastParentY; mTouchToWindowOffsetY = newVerticalOffset + mLastParentY;
final float newPosX = final float newPosX =
rawX - mTouchToWindowOffsetX + mHotspotX + getHorizontalOffset(); xInWindow - mTouchToWindowOffsetX + mHotspotX + getHorizontalOffset();
final float newPosY = rawY - mTouchToWindowOffsetY + mTouchOffsetY; final float newPosY = yInWindow - mTouchToWindowOffsetY + mTouchOffsetY;
updatePosition(newPosX, newPosY); updatePosition(newPosX, newPosY);
break; break;