commit a79b18ad36ca9025ac4862c492260a656f61c7cf
author Winson Chung <winsonc@google.com> Mon Aug 24 22:47:52 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 24 22:47:52 2015 +0000
tree 0d48faf057255603368adf722ce67f15ad51aeb8
parent 944bfab018a2933a046a5661a244daf605d8d5c7
parent 08d627566c841d8fb1c3a38ec99649832870c119

Merge "Fixing widgets container inactive scroll bar color." into ub-launcher3-burnaby

src/com/android/launcher3/StylusEventHelper.java

diff --git a/src/com/android/launcher3/StylusEventHelper.java b/src/com/android/launcher3/StylusEventHelper.java
index da46e6a..e03273a 100644
--- a/src/com/android/launcher3/StylusEventHelper.java
+++ b/src/com/android/launcher3/StylusEventHelper.java
@@ -1,8 +1,5 @@
 package com.android.launcher3;
 
-import com.android.launcher3.Utilities;
-
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -77,8 +74,9 @@
      * @param event The event to check.
      * @return Whether a stylus button press occurred.
      */
-    public static boolean isStylusButtonPressed(MotionEvent event) {
+    private static boolean isStylusButtonPressed(MotionEvent event) {
         return event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS
-                && event.isButtonPressed(MotionEvent.BUTTON_SECONDARY);
+                && ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY)
+                        == MotionEvent.BUTTON_SECONDARY);
     }
 }
\ No newline at end of file