Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7499a1ca authored by Gilles Debunne's avatar Gilles Debunne
Browse files

resolved conflicts for merge of 5d146549 to master 

Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b
parents 329430a5 5d146549

core/java/android/widget/TextView.java

+1 −2
Original line number Diff line number Diff line
@@ -8023,8 +8023,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;

                final float newPosY = rawY - mTouchToWindowOffsetY + mHotspotY + mTouchOffsetY;



                mController.updatePosition(this, (int) Math.round(newPosX),

                        (int) Math.round(newPosY));

                mController.updatePosition(this, Math.round(newPosX), Math.round(newPosY));



                break;

            }