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

am 3e43afed: am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev

Browse Source 
* commit '3e43afed48ea49e2ec1f0e65d0600d26da720877':
  Fix: Drag handle jumps between bidi boundaries.
This commit is contained in:
Keisuke Kuroyanagi
2015-06-18 04:08:37 +00:00
committed by Android Git Automerger
parent 6343f2f605 3e43afed48
commit 4e0ff9c124
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3568,13 +3568,24 @@ public class Editor {
}
protected void updateDrawable() {
if (mIsDragging) {
// Don't update drawable during dragging.
return;
}
final int offset = getCurrentCursorOffset();
final boolean isRtlCharAtOffset = mTextView.getLayout().isRtlCharAt(offset);
final Drawable oldDrawable = mDrawable;
mDrawable = isRtlCharAtOffset ? mDrawableRtl : mDrawableLtr;
mHotspotX = getHotspotX(mDrawable, isRtlCharAtOffset);
mHorizontalGravity = getHorizontalGravity(isRtlCharAtOffset);
if (oldDrawable != mDrawable) {
final Layout layout = mTextView.getLayout();
if (layout != null && oldDrawable != mDrawable && isShowing()) {
// Update popup window position.
mPositionX = (int) (layout.getPrimaryHorizontal(offset) - 0.5f - mHotspotX -
getHorizontalOffset() + getCursorOffset());
mPositionX += mTextView.viewportToContentHorizontalOffset();
mPositionHasChanged = true;
updatePosition(mLastParentX, mLastParentY, false, false);
postInvalidate();
}
}
@@ -3848,10 +3859,12 @@ public class Editor {
case MotionEvent.ACTION_UP:
filterOnTouchUp();
mIsDragging = false;
updateDrawable();
break;
case MotionEvent.ACTION_CANCEL:
mIsDragging = false;
updateDrawable();
break;
}
return true;