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

am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair

Browse Source 
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2'

* commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2':
  If ZoomButttonsController detects more than one pointer,
This commit is contained in:
Grace Kloba
2010-01-21 17:56:46 -08:00
committed by Android Git Automerger
parent 3ccf06e2c5 8d4baa7893
commit 01752fe46b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/ZoomButtonsController.java
View File

@@ -546,6 +546,11 @@ public class ZoomButtonsController implements View.OnTouchListener {
public boolean onTouch(View v, MotionEvent event) {
int action = event.getAction();
if (event.getPointerCount() > 1) {
// ZoomButtonsController doesn't handle mutitouch. Give up control.
return false;
}
if (mReleaseTouchListenerOnUp) {
// The controls were dismissed but we need to throw away all events until the up
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {