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

Merge "[Magnifier-35] Do not show when text is large" into pi-dev

Browse Source 
am: f45b3a1136

Change-Id: I6f050b6dfe847daf8d3ebef29398344d69d8baf5
This commit is contained in:
Mihai Popa
2018-03-27 18:20:26 +00:00
committed by android-build-merger
parent 291ca93827 f45b3a1136
commit c5a25dd6b4
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4824,13 +4824,23 @@ 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;
}
protected final void updateMagnifier(@NonNull final MotionEvent event) {
if (mMagnifierAnimator == null) {
return;
}
final PointF showPosInView = new PointF();
final boolean shouldShow = obtainMagnifierShowCoordinates(event, showPosInView);
final boolean shouldShow = !tooLargeTextForMagnifier()
&& obtainMagnifierShowCoordinates(event, showPosInView);
if (shouldShow) {
// Make the cursor visible and stop blinking.
mRenderCursorRegardlessTiming = true;