commit f45b3a1136ebe31126f992c26e5378c661bbc440
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 17:20:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 17:20:12 2018 +0000
tree c8dfb48100401213502a4486fca3beb8f4b87b17
parent 0d5bbf77b528b77255d3a6abf7c74935fe924e51
parent 894469ce0eaa705739e885f4a1b007f73f714e01

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

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 3775835..57d64b9 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -4824,13 +4824,23 @@
             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;