diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-18 15:17:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 15:17:12 -0700 |
| commit | f2c406030874b355ca9e4e67cc0e3aff6103c23e (patch) | |
| tree | cef3bae978fb412cb4d905dab3f989544aedc71e /include | |
| parent | 8b5161c2aed8637de9bffb1d81298d60ea237caf (diff) | |
| parent | 7689dd4928d1cc4080e43f83a523521b5ecf44e5 (diff) | |
| download | frameworks_base-f2c406030874b355ca9e4e67cc0e3aff6103c23e.zip frameworks_base-f2c406030874b355ca9e4e67cc0e3aff6103c23e.tar.gz frameworks_base-f2c406030874b355ca9e4e67cc0e3aff6103c23e.tar.bz2 | |
am 7689dd49: Merge "Fix bug where home presses were not poking user activity." into gingerbread
Merge commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5' into gingerbread-plus-aosp
* commit '7689dd4928d1cc4080e43f83a523521b5ecf44e5':
Fix bug where home presses were not poking user activity.
Diffstat (limited to 'include')
| -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 4955d47..b0b855e 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; @@ -1004,8 +1001,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); |