summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Wu <mattwu@google.com> 2016-01-14 12:59:24 -0800
committer Matt Wu <mattwu@google.com> 2016-01-14 12:59:24 -0800
commitd6bc96dbc71d2657815deb2cd44780da99ea3f1f (patch)
tree3684e1bf54e1686798f691aab7405aee9250c6c3
parent477e26cf931290f6b3353fab43a05406eea223f9 (diff)
Set WindowSession's touchmode when in local focus mode,
since relayout window can query window manager for isInTouchMode(). Bug:24848552 Change-Id: Icda267d617c09dfd2b22af4019b8313181c4c661
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 3eb2e37be781..3bea9a520c3c 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3534,9 +3534,7 @@ public final class ViewRootImpl implements ViewParent,
// tell the window manager
try {
- if (!isInLocalFocusMode()) {
- mWindowSession.setInTouchMode(inTouchMode);
- }
+ mWindowSession.setInTouchMode(inTouchMode);
} catch (RemoteException e) {
throw new RuntimeException(e);
}