diff options
author | Adam Cohen <adamcohen@google.com> | 2013-09-17 19:08:21 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-09-17 19:09:54 -0700 |
commit | 1697b79a86c8244cf2758eec93e0ba299bc107d0 (patch) | |
tree | b66dffa672a43a6420495339b3b37f322ea35cf8 /src/com/android/launcher3/PagedView.java | |
parent | f82f344a672077da64a2d36797a24fdb737dd104 (diff) | |
download | android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.tar.gz android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.tar.bz2 android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.zip |
Fixing up click / long click to enter / exit overview mode
Change-Id: I1ec7ab7f3e5c67add9ae64901e0ea377e265ed84
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 0b0c4b988..30c3ea752 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -341,7 +341,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } mPageIndicator.addMarkers(markers, mAllowPagedViewAnimations); - mPageIndicator.setOnClickListener((Launcher) getContext()); } } @@ -585,6 +584,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc for (int i = 0; i < count; i++) { getPageAt(i).setOnLongClickListener(l); } + super.setOnLongClickListener(l); } @Override @@ -1591,6 +1591,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return false; } + super.onTouchEvent(ev); + // Skip touch handling if there are no pages to swipe if (getChildCount() <= 0) return super.onTouchEvent(ev); @@ -1886,7 +1888,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mActivePointerId = INVALID_POINTER; } - protected void onUnhandledTap(MotionEvent ev) {} + protected void onUnhandledTap(MotionEvent ev) { + ((Launcher) getContext()).onClick(this); + } @Override public boolean onGenericMotionEvent(MotionEvent event) { |