diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-20 02:28:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 02:28:53 +0000 |
| commit | 5b5c88171ec0b24553111465eb8e4484d58bcfab (patch) | |
| tree | 3f16e926320b4a029f3ec480593532568f5828dd /src | |
| parent | f20e184eb58381266f572e9420bf5712358c222e (diff) | |
| parent | e8115d5664a6f72b7a2062280c1bcf5dd457ab90 (diff) | |
| download | android_packages_apps_Trebuchet-5b5c88171ec0b24553111465eb8e4484d58bcfab.tar.gz android_packages_apps_Trebuchet-5b5c88171ec0b24553111465eb8e4484d58bcfab.tar.bz2 android_packages_apps_Trebuchet-5b5c88171ec0b24553111465eb8e4484d58bcfab.zip | |
Merge "Fix bug: wallpaper strip needed two taps to come back" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/CropView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/CropView.java b/src/com/android/launcher3/CropView.java index 32c590d91..c4d1475c6 100644 --- a/src/com/android/launcher3/CropView.java +++ b/src/com/android/launcher3/CropView.java @@ -44,6 +44,7 @@ public class CropView extends TiledImageView implements OnScaleGestureListener { public interface TouchCallback { void onTouchDown(); void onTap(); + void onTouchUp(); } public CropView(Context context) { @@ -202,6 +203,7 @@ public class CropView extends TiledImageView implements OnScaleGestureListener { now < mTouchDownTime + ViewConfiguration.getTapTimeout()) { mTouchCallback.onTap(); } + mTouchCallback.onTouchUp(); } if (!mTouchEnabled) { diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 777460933..868b1dfb8 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -109,6 +109,7 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { 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 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { .setInterpolator(new DecelerateInterpolator(0.75f)); mAnim.start(); } + @Override + public void onTouchUp() { + mIgnoreNextTap = false; + } + @Override public void onTap() { boolean ignoreTap = mIgnoreNextTap; mIgnoreNextTap = false; |