summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpike Sprague <spikuru@google.com>2014-08-27 11:25:45 -0700
committerThe Android Automerger <android-build@google.com>2014-08-27 14:47:31 -0700
commit9cc7ef5128b18de6160c84fddf4da39f7e2356b3 (patch)
tree3d03256bb074a1fa021a516ba7c6f99a7c1a89f6
parent320bd2ed832e44fd93376958f031a5162a07863b (diff)
downloadandroid_packages_apps_Camera2-9cc7ef5128b18de6160c84fddf4da39f7e2356b3.tar.gz
android_packages_apps_Camera2-9cc7ef5128b18de6160c84fddf4da39f7e2356b3.tar.bz2
android_packages_apps_Camera2-9cc7ef5128b18de6160c84fddf4da39f7e2356b3.zip
fix for a doublebounce of the filmstip button on filmstip swipe out
bug: 17301367 Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477
-rw-r--r--src/com/android/camera/widget/FilmstripLayout.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java
index c943b7eb2..2e7819ad0 100644
--- a/src/com/android/camera/widget/FilmstripLayout.java
+++ b/src/com/android/camera/widget/FilmstripLayout.java
@@ -327,7 +327,6 @@ public class FilmstripLayout extends FrameLayout implements FilmstripContentPane
mSwipeTrend = (((int) dx) >> 1) + (mSwipeTrend >> 1);
if (dx < 0 && mFilmstripContentLayout.getTranslationX() == 0) {
mBackgroundDrawable.setOffset(0);
- FilmstripLayout.this.onSwipeOutBegin();
}
// When we start translating the filmstrip in, we want the left edge of the