commit 7528f57c4ddbde1c6d0a2a352bd8a1af43711013
author Joe LaPenna <jlapenna@google.com> Fri Jan 22 07:11:49 2016 -0800
committer Anthony Hugh <ahugh@google.com> Wed Jan 27 14:19:44 2016 -0800
tree 7c675e70a719a985b1a122b489029634c6ebef7f
parent 907108ca0f4e69dd170a507c5830591712ec5967

[DO NOT MERGE ANYWHERE]: Allow button events in ambient.

See thread: "key presses & Ambient"

BUG: 25964771
BUG: 26524301

Change-Id: I914edd447c38678a06d27677be4597c0ee384635

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 9569422..8adbace 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3712,7 +3712,8 @@
                 return true;
             } else if ((!mAttachInfo.mHasWindowFocus
                     && !q.mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) || mStopped
-                    || mIsAmbientMode || (mPausedForTransition && !isBack(q.mEvent))) {
+                    || (mIsAmbientMode && !q.mEvent.isFromSource(InputDevice.SOURCE_CLASS_BUTTON))
+                    || (mPausedForTransition && !isBack(q.mEvent))) {
                 // This is a focus event and the window doesn't currently have input focus or
                 // has stopped. This could be an event that came back from the previous stage
                 // but the window has lost focus or stopped in the meantime.