Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow button events in ambient." into nyc-dev

Browse Source 
am: 1e413f5b77

* commit '1e413f5b77b4105479eb7686dfa9b8428bdf58a1':
  Allow button events in ambient.
This commit is contained in:
Anthony Hugh
2016-02-22 20:53:15 +00:00
committed by android-build-merger
parent 775554ff02 1e413f5b77
commit 97f0727cfe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewRootImpl.java
View File

@@ -3797,7 +3797,8 @@ public final class ViewRootImpl implements ViewParent,
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.