diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-10 22:53:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-10 22:53:25 +0000 |
commit | b6e2aad8d19cbd184438ecbc20e87befe858516f (patch) | |
tree | a3906316d38603c4c968d3214b6b3adc642768e5 | |
parent | 773824cdfe68a27c7df8ef1410a4e875655f4acc (diff) | |
parent | d36d9476dc2ed915d90f8df5916450c02d107eff (diff) | |
download | android_packages_apps_Trebuchet-b6e2aad8d19cbd184438ecbc20e87befe858516f.tar.gz android_packages_apps_Trebuchet-b6e2aad8d19cbd184438ecbc20e87befe858516f.tar.bz2 android_packages_apps_Trebuchet-b6e2aad8d19cbd184438ecbc20e87befe858516f.zip |
Merge "Fix issue where can't long click page indicators (issue 11136731)" into jb-ub-now-indigo-rose
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index bbe09463a..66d441056 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -53,6 +53,7 @@ import android.view.Display; 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 @@ public class Workspace extends SmoothPagedView 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); |