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

Merge "Fix bugs when transitioning out of touch mode"

Browse Source
This commit is contained in:
Adam Powell
2010-03-15 14:14:13 -07:00
committed by Android (Google) Code Review
parent b06a68b9c4 51a6bee671
commit 6af8e145f2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2241,7 +2241,8 @@ public final class ViewRoot extends Handler implements ViewParent,
* leaving touch mode alone is considered the event).
*/
private boolean checkForLeavingTouchModeAndConsume(KeyEvent event) {
if (event.getAction() != KeyEvent.ACTION_DOWN) {
final int action = event.getAction();
if (action != KeyEvent.ACTION_DOWN && action != KeyEvent.ACTION_MULTIPLE) {
return false;
}
if ((event.getFlags()&KeyEvent.FLAG_KEEP_TOUCH_MODE) != 0) {

10
core/java/android/widget/AbsListView.java
View File

@@ -1980,11 +1980,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
if (touchMode == TOUCH_MODE_OVERSCROLL || touchMode == TOUCH_MODE_OVERFLING) {
if (mFlingRunnable != null) {
mFlingRunnable.endFling();
if (mScrollY != 0) {
mScrollY = 0;
invalidate();
}
}
if (mScrollY != 0) {
mScrollY = 0;
invalidate();
}
}
}