fix for a regression introduced in ag/534531

that CL kept the swipe-away-from-filmstip
preview background from alpha-animating correctly.

this CL fixes that and provides an alternate solution
to bug 17301367

Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5

diff --git a/src/com/android/camera/app/FilmstripBottomPanel.java b/src/com/android/camera/app/FilmstripBottomPanel.java
index 661e50f..f978856 100644 (file)
--- a/src/com/android/camera/app/FilmstripBottomPanel.java
+++ b/src/com/android/camera/app/FilmstripBottomPanel.java
@@ -269,16 +269,17 @@ class FilmstripBottomPanel implements CameraAppUI.BottomPanel {
     }
 
     public void show() {
-        int offset = mLayout.getHeight();
-        mLayout.setTranslationY(offset);
-        mLayout.animate().translationY(0).setDuration(ANIM_DURATION)
-                .setInterpolator(Gusterpolator.INSTANCE);
+        if (mLayout.getTranslationY() > 0) {
+            mLayout.animate().translationY(0).setDuration(ANIM_DURATION)
+                    .setInterpolator(Gusterpolator.INSTANCE);
+        }
     }
 
     public void hide() {
         int offset = mLayout.getHeight();
-        mLayout.setTranslationY(0);
-        mLayout.animate().translationY(offset).setDuration(ANIM_DURATION)
-                .setInterpolator(Gusterpolator.INSTANCE);
+        if (mLayout.getTranslationY() < offset) {
+            mLayout.animate().translationY(offset).setDuration(ANIM_DURATION)
+                    .setInterpolator(Gusterpolator.INSTANCE);
+        }
     }
 }

diff --git a/src/com/android/camera/widget/FilmstripLayout.java b/src/com/android/camera/widget/FilmstripLayout.java
index 2e7819a..c943b7e 100644 (file)
--- a/src/com/android/camera/widget/FilmstripLayout.java
+++ b/src/com/android/camera/widget/FilmstripLayout.java
@@ -327,6 +327,7 @@ 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