From a620073f23dca7b4e2222c9585184ebb70fd18c5 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Tue, 28 May 2013 18:35:48 +0100 Subject: Android: Tweak towards api-7 compatibility Avoid using event.getActionMasked. --- android/src/com/artifex/mupdfdemo/MuPDFReaderView.java | 2 +- android/src/com/artifex/mupdfdemo/ReaderView.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'android') diff --git a/android/src/com/artifex/mupdfdemo/MuPDFReaderView.java b/android/src/com/artifex/mupdfdemo/MuPDFReaderView.java index 0aa1909b..3a1b708a 100644 --- a/android/src/com/artifex/mupdfdemo/MuPDFReaderView.java +++ b/android/src/com/artifex/mupdfdemo/MuPDFReaderView.java @@ -148,7 +148,7 @@ public class MuPDFReaderView extends ReaderView { } public boolean onTouchEvent(MotionEvent event) { - if (event.getActionMasked() == MotionEvent.ACTION_DOWN) + if ((event.getAction() & event.ACTION_MASK) == MotionEvent.ACTION_DOWN) tapDisabled = false; return super.onTouchEvent(event); diff --git a/android/src/com/artifex/mupdfdemo/ReaderView.java b/android/src/com/artifex/mupdfdemo/ReaderView.java index 87f250ba..f4f54722 100644 --- a/android/src/com/artifex/mupdfdemo/ReaderView.java +++ b/android/src/com/artifex/mupdfdemo/ReaderView.java @@ -482,10 +482,10 @@ public class ReaderView if (!mScaling) mGestureDetector.onTouchEvent(event); - if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { + if ((event.getAction() & event.ACTION_MASK) == MotionEvent.ACTION_DOWN) { mUserInteracting = true; } - if (event.getActionMasked() == MotionEvent.ACTION_UP) { + if ((event.getAction() & event.ACTION_MASK) == MotionEvent.ACTION_UP) { mScrollDisabled = false; mUserInteracting = false; -- cgit v1.2.3