From 3143786830b1157bcb7b24bbdf8470afe0fb7d21 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Wed, 30 Nov 2016 01:19:48 +0000 Subject: [PATCH] am b3a2664f: am ba02c9da: am 57a0f459: am 88cccf6c: Fix NoSuchMethodError in CoL on Eclair 2.1 * commit 'b3a2664ff3b40fa44a3f8fe5d1d91dfdfa8b765e': Fix NoSuchMethodError in CoL on Eclair 2.1 GitOrigin-RevId=99e551c073e9573c49e611e7a943ffd4003ea015 PiperOrigin-RevId: 140548820 --- src/android/support/design/widget/CoordinatorLayout.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/android/support/design/widget/CoordinatorLayout.java b/src/android/support/design/widget/CoordinatorLayout.java index c0e749314..c447b5f1c 100644 --- a/src/android/support/design/widget/CoordinatorLayout.java +++ b/src/android/support/design/widget/CoordinatorLayout.java @@ -32,6 +32,7 @@ import android.os.SystemClock; import android.support.design.R; import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; +import android.support.v4.view.MotionEventCompat; import android.support.v4.view.NestedScrollingParent; import android.support.v4.view.NestedScrollingParentHelper; import android.support.v4.view.ViewCompat; @@ -314,7 +315,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen MotionEvent cancelEvent = null; - final int action = ev.getActionMasked(); + final int action = MotionEventCompat.getActionMasked(ev); final List topmostChildList = mTempList1; getTopSortedChildren(topmostChildList); @@ -366,7 +367,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen public boolean onInterceptTouchEvent(MotionEvent ev) { MotionEvent cancelEvent = null; - final int action = ev.getActionMasked(); + final int action = MotionEventCompat.getActionMasked(ev); // Make sure we reset in case we had missed a previous important event. if (action == MotionEvent.ACTION_DOWN) { @@ -392,7 +393,7 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen boolean cancelSuper = false; MotionEvent cancelEvent = null; - final int action = ev.getActionMasked(); + final int action = MotionEventCompat.getActionMasked(ev); if (mBehaviorTouchView != null || (cancelSuper = performIntercept(ev))) { // Safe since performIntercept guarantees that