commit d36d9476dc2ed915d90f8df5916450c02d107eff
author Adam Cohen <adamcohen@google.com> Thu Oct 10 15:32:41 2013 -0700
committer Adam Cohen <adamcohen@google.com> Thu Oct 10 15:32:59 2013 -0700
tree a85dee8a43c09cbff75cab4083c0d05315540685
parent bb6fda6ac3c4246b91cf66b28cdbc89c3d8a3e52

Fix issue where can't long click page indicators (issue 11136731)

Change-Id: Idcd3a3eabed9db6f1ab17891544578170b8cac6f

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index bbe0946..66d4410 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -53,6 +53,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.View.OnClickListener;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -1524,7 +1525,10 @@
         if (getPageIndicator() != null) {
             // In case accessibility state has changed, we need to perform this on every
             // attach to window
-            getPageIndicator().setOnClickListener(getPageIndicatorClickListener());
+            OnClickListener listener = getPageIndicatorClickListener();
+            if (listener != null) {
+                getPageIndicator().setOnClickListener(listener);
+            }
         }
         AccessibilityManager am = (AccessibilityManager)
                 getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);