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
This commit is contained in:
Chris Banes 2016-11-30 01:19:48 +00:00 committed by Travis Collins
parent 694c7b4f04
commit 3143786830

View File

@ -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<View> 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