Ensure right non-neighbors are invisible during filmstrip item scaling

Only the immediate right hand neighbor should fade out and translate to
center when drag-scaling the centered filmstrip item. Regression from G
to H, this CL ensures only the immediate neighbor is visible.

Bug: 19127110
Change-Id: I4023b91c384abd2b139b04124167cce8cb50c618

1 files changed, 10 insertions, 2 deletions

diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java
index f910b16e0..0d3cee495 100644
--- a/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@ -1286,19 +1286,27 @@ public class FilmstripView extends ViewGroup {
                 // It's in full-screen mode.
                 fadeAndScaleRightViewItem(i);
             } else {
-                boolean setToVisible = (curr.getVisibility() == INVISIBLE);
+                boolean isVisible = (curr.getVisibility() == VISIBLE);
+                boolean setToVisible = !isVisible;
 
                 if (i == BUFFER_CENTER + 1) {
+                    // right hand neighbor needs to fade based on scale of
+                    // center
                     curr.setAlpha(1f - scaleFraction);
                 } else {
                     if (scaleFraction == 0f) {
                         curr.setAlpha(1f);
                     } else {
+                        // further right items should not display when center
+                        // is being scaled
                         setToVisible = false;
+                        if (isVisible) {
+                            curr.setVisibility(INVISIBLE);
+                        }
                     }
                 }
 
-                if (setToVisible) {
+                if (setToVisible && !isVisible) {
                     curr.setVisibility(VISIBLE);
                 }