diff options
author | Jeff Brown <jeffbrown@google.com> | 2010-10-19 09:55:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:55:39 -0700 |
commit | 2659f40403a7927ff421cf084f3b8e8b3e763ce9 (patch) | |
tree | 4afc4ae360009933b125f1c83294af7beb4e2049 /include/ui | |
parent | 7a505628df198a5594038731e3bf436d9ab59de9 (diff) | |
parent | c0bc4a3976095ea9efe48bb557953423afaf7a41 (diff) | |
download | frameworks_native-2659f40403a7927ff421cf084f3b8e8b3e763ce9.zip frameworks_native-2659f40403a7927ff421cf084f3b8e8b3e763ce9.tar.gz frameworks_native-2659f40403a7927ff421cf084f3b8e8b3e763ce9.tar.bz2 |
am f2c40603: am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e'
* commit 'f2c406030874b355ca9e4e67cc0e3aff6103c23e':
Fix bug where home presses were not poking user activity.
Diffstat (limited to 'include/ui')
-rw-r--r-- | include/ui/InputDispatcher.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/ui/InputDispatcher.h b/include/ui/InputDispatcher.h index b811ace..738f62a 100644 --- a/include/ui/InputDispatcher.h +++ b/include/ui/InputDispatcher.h @@ -109,9 +109,6 @@ struct InputTarget { // (ignored for KeyEvents) float xOffset, yOffset; - // The window type of the input target. - int32_t windowType; - // The subset of pointer ids to include in motion events dispatched to this input target // if FLAG_SPLIT is set. BitSet32 pointerIds; @@ -1018,8 +1015,7 @@ private: void addWindowTargetLocked(const InputWindow* window, int32_t targetFlags, BitSet32 pointerIds); void addMonitoringTargetsLocked(); - bool shouldPokeUserActivityForCurrentInputTargetsLocked(); - void pokeUserActivityLocked(nsecs_t eventTime, int32_t eventType); + void pokeUserActivityLocked(const EventEntry* eventEntry); bool checkInjectionPermission(const InputWindow* window, const InjectionState* injectionState); bool isWindowObscuredAtPointLocked(const InputWindow* window, int32_t x, int32_t y) const; bool isWindowFinishedWithPreviousInputLocked(const InputWindow* window); |