commit 956545b07ff921b281401049a971e19ad01a4cc9
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 27 17:39:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 27 17:40:03 2017 +0000
tree cd7d6eb2a6a38f3e2760295b085e61a6739aa15b
parent 592637dc69d137105c49bf949e3738e9165b2fd2
parent 7614cdf9c39039e6aaf5a896006445046003215a

Merge "Exit touch mode on mouse/stylus click"

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index b79f22f..20d960f 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -4305,11 +4305,11 @@
                 mTranslator.translateEventInScreenToAppWindow(event);
             }
 
-            // Enter touch mode on down or scroll.
+            // Enter touch mode on down or scroll, if it is coming from a touch screen device,
+            // exit otherwise.
             final int action = event.getAction();
-            if (event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)
-                    && (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL)) {
-                ensureTouchMode(true);
+            if (action == MotionEvent.ACTION_DOWN || action == MotionEvent.ACTION_SCROLL) {
+                ensureTouchMode(event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN));
             }
 
             if (action == MotionEvent.ACTION_DOWN && mAttachInfo.mTooltipHost != null) {