From 1cbdd390f3e0c9cc82f72f369619167d2af4ee14 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Wed, 27 Mar 2013 13:12:33 -0400
Subject: [PATCH] Use non-deprecated constants

---
 src/com/fsck/k9/view/NonLockingScrollView.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/view/NonLockingScrollView.java b/src/com/fsck/k9/view/NonLockingScrollView.java
index fbb56a618..05788e22d 100644
--- a/src/com/fsck/k9/view/NonLockingScrollView.java
+++ b/src/com/fsck/k9/view/NonLockingScrollView.java
@@ -17,6 +17,7 @@
 
 package com.fsck.k9.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -141,11 +142,11 @@ public class NonLockingScrollView extends ScrollView {
         return false;
     }
 
-    @SuppressWarnings("deprecation")
+    @SuppressLint("InlinedApi")
     private static int getActionIndex(MotionEvent ev) {
         // Equivalent to MotionEvent.getActionIndex() which is in API 8+
-        return ((ev.getAction() & MotionEvent.ACTION_POINTER_ID_MASK)
-                >> MotionEvent.ACTION_POINTER_ID_SHIFT);
+        return ((ev.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
+                >> MotionEvent.ACTION_POINTER_INDEX_SHIFT);
     }
 
     private static boolean canViewReceivePointerEvents(View child) {