From bc89a5ce34c676b6baa37253589989b772010f35 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Mon, 18 May 2015 14:49:29 +0900
Subject: [PATCH] Fix: Insertion handle can be moved just by tapping.

Horizontal poistion is passed to updatePosition() without
adding getHorizontalOffset(). The position is wrong for the
insertion handle; thus, the handle is moved just by tapping
on it.

Bug: 20923263
Change-Id: Ie867ebd9e6b682057b73373fefb7b2baf45caef9
---
 core/java/android/widget/Editor.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index a1194f7dfa95f..bd6c328e201ae 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3687,7 +3687,8 @@ public class Editor {
                     }
                     mTouchToWindowOffsetY = newVerticalOffset + mLastParentY;
 
-                    final float newPosX = rawX - mTouchToWindowOffsetX + mHotspotX;
+                    final float newPosX =
+                            rawX - mTouchToWindowOffsetX + mHotspotX + getHorizontalOffset();
                     final float newPosY = rawY - mTouchToWindowOffsetY + mTouchOffsetY;
 
                     updatePosition(newPosX, newPosY);