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

Merge "[Magnifier-37] Hide handle when overlaps magnifier" into pi-dev

Browse Source 
am: 3708933872

Change-Id: I9b8cfebb79d9a886b502bc1057716c3b20b3d7f3
This commit is contained in:
Mihai Popa
2018-03-29 23:06:57 +00:00
committed by android-build-merger
parent 70c93a28e0 3708933872
commit af5d27b174
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4585,8 +4585,8 @@ public class Editor {
return mContainer.isShowing();
}
private boolean isVisible() {
// Always show a dragging handle.
private boolean shouldShow() {
// A dragging handle should always be shown.
if (mIsDragging) {
return true;
}
@@ -4599,6 +4599,10 @@ public class Editor {
mPositionX + mHotspotX + getHorizontalOffset(), mPositionY);
}
private void setVisible(final boolean visible) {
mContainer.getContentView().setVisibility(visible ? VISIBLE : INVISIBLE);
}
public abstract int getCurrentCursorOffset();
protected abstract void updateSelection(int offset);
@@ -4692,7 +4696,7 @@ public class Editor {
onHandleMoved();
}
if (isVisible()) {
if (shouldShow()) {
// Transform to the window coordinates to follow the view tranformation.
final int[] pts = { mPositionX + mHotspotX + getHorizontalOffset(), mPositionY};
mTextView.transformFromViewToWindowSpace(pts);
@@ -4745,6 +4749,15 @@ public class Editor {
return 0;
}
private boolean tooLargeTextForMagnifier() {
final float magnifierContentHeight = Math.round(
mMagnifierAnimator.mMagnifier.getHeight()
/ mMagnifierAnimator.mMagnifier.getZoom());
final Paint.FontMetrics fontMetrics = mTextView.getPaint().getFontMetrics();
final float glyphHeight = fontMetrics.descent - fontMetrics.ascent;
return glyphHeight > magnifierContentHeight;
}
/**
* Computes the position where the magnifier should be shown, relative to
* {@code mTextView}, and writes them to {@code showPosInView}. Also decides
@@ -4824,13 +4837,12 @@ public class Editor {
return true;
}
private boolean tooLargeTextForMagnifier() {
final float magnifierContentHeight = Math.round(
mMagnifierAnimator.mMagnifier.getHeight()
/ mMagnifierAnimator.mMagnifier.getZoom());
final Paint.FontMetrics fontMetrics = mTextView.getPaint().getFontMetrics();
final float glyphHeight = fontMetrics.descent - fontMetrics.ascent;
return glyphHeight > magnifierContentHeight;
private boolean handleOverlapsMagnifier() {
final int handleY = mContainer.getDecorViewLayoutParams().y;
final int magnifierBottomWhenAtWindowTop =
mTextView.getRootWindowInsets().getSystemWindowInsetTop()
+ mMagnifierAnimator.mMagnifier.getHeight();
return handleY <= magnifierBottomWhenAtWindowTop;
}
protected final void updateMagnifier(@NonNull final MotionEvent event) {
@@ -4846,6 +4858,13 @@ public class Editor {
mRenderCursorRegardlessTiming = true;
mTextView.invalidateCursorPath();
suspendBlink();
// Hide handle if it overlaps the magnifier.
if (handleOverlapsMagnifier()) {
setVisible(false);
} else {
setVisible(true);
}
mMagnifierAnimator.show(showPosInView.x, showPosInView.y);
} else {
dismissMagnifier();
@@ -4857,6 +4876,7 @@ public class Editor {
mMagnifierAnimator.dismiss();
mRenderCursorRegardlessTiming = false;
resumeBlink();
setVisible(true);
}
}