commit e8115d5664a6f72b7a2062280c1bcf5dd457ab90
author Michael Jurka <mikejurka@google.com> Fri Sep 20 03:52:24 2013 +0200
committer Michael Jurka <mikejurka@google.com> Fri Sep 20 03:52:24 2013 +0200
tree e854a1a67d9279430cedcece9e35210ec18e72f2
parent 8be886da011371e60863b2f4d2cd1dcb1581505a

Fix bug: wallpaper strip needed two taps to come back

Bug: 10781201

src/com/android/launcher3/CropView.java

diff --git a/src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java
index 32c590d..c4d1475 100644
--- a/src/com/android/launcher3/CropView.java
+++ b/src/com/android/launcher3/CropView.java
@@ -44,6 +44,7 @@
     public interface TouchCallback {
         void onTouchDown();
         void onTap();
+        void onTouchUp();
     }
 
     public CropView(Context context) {
@@ -202,6 +203,7 @@
                     now < mTouchDownTime + ViewConfiguration.getTapTimeout()) {
                 mTouchCallback.onTap();
             }
+            mTouchCallback.onTouchUp();
         }
 
         if (!mTouchEnabled) {

src/com/android/launcher3/WallpaperPickerActivity.java

diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index 7774609..868b1df 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -109,6 +109,7 @@
         final View wallpaperStrip = findViewById(R.id.wallpaper_strip);
         mCropView.setTouchCallback(new CropView.TouchCallback() {
             LauncherViewPropertyAnimator mAnim;
+            @Override
             public void onTouchDown() {
                 if (mAnim != null) {
                     mAnim.cancel();
@@ -121,6 +122,11 @@
                         .setInterpolator(new DecelerateInterpolator(0.75f));
                 mAnim.start();
             }
+            @Override
+            public void onTouchUp() {
+                mIgnoreNextTap = false;
+            }
+            @Override
             public void onTap() {
                 boolean ignoreTap = mIgnoreNextTap;
                 mIgnoreNextTap = false;