commit 0038ac1bafa1aaba22d4d46d062a9e3045f8a1ae
author Sunny Goyal <sunnygoyal@google.com> Mon Aug 24 17:20:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 24 17:20:59 2015 +0000
tree e1b17bc67533f273c7d62edc526afa2b6de01738
parent 6cfe5fcd8a79e9af8c5a97220dd800f4f1239b17
parent bcbc2ec2cd2673b5fca40f8458f75a7712410dda

am bcbc2ec2: Merge "Removing call to isButtonPressed as its only Lollipop and above" into ub-launcher3-burnaby

* commit 'bcbc2ec2cd2673b5fca40f8458f75a7712410dda':
  Removing call to isButtonPressed as its only Lollipop and above

src/com/android/launcher3/StylusEventHelper.java

diff --git a/src/com/android/launcher3/StylusEventHelper.java b/src/com/android/launcher3/StylusEventHelper.java
index d0e3188..d5fc0fa 100644
--- a/src/com/android/launcher3/StylusEventHelper.java
+++ b/src/com/android/launcher3/StylusEventHelper.java
@@ -101,8 +101,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