drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread

Browse Source
This commit is contained in:
Jeff Brown
2011-03-03 14:42:14 -08:00
committed by Android (Google) Code Review
parent 611af23818 59fd13c7be
commit e23c235c66
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ui/InputDispatcher.cpp
View File

@ -592,10 +592,6 @@ InputDispatcher::KeyEntry* InputDispatcher::synthesizeKeyRepeatLocked(
// mKeyRepeatState.lastKeyEntry in addition to the one we return. // mKeyRepeatState.lastKeyEntry in addition to the one we return.
entry->refCount += 1; entry->refCount += 1;
if (entry->repeatCount == 1) {
entry->flags |= AKEY_EVENT_FLAG_LONG_PRESS;
}
mKeyRepeatState.nextRepeatTime = currentTime + keyRepeatDelay; mKeyRepeatState.nextRepeatTime = currentTime + keyRepeatDelay;
return entry; return entry;
} }
@ -645,6 +641,12 @@ bool InputDispatcher::dispatchKeyLocked(
resetKeyRepeatLocked(); resetKeyRepeatLocked();
} }
if (entry->repeatCount == 1) {
entry->flags |= AKEY_EVENT_FLAG_LONG_PRESS;
} else {
entry->flags &= ~AKEY_EVENT_FLAG_LONG_PRESS;
}
entry->dispatchInProgress = true; entry->dispatchInProgress = true;
resetTargetsLocked(); resetTargetsLocked();