Limit setting photo item placeholders when session is done.

Only add placeholders for an item visible in the filmstrip. If a session
is done for an item not visible, it is less janky for the user to see the
standard gray placeholder while loading the image from disk.

Pruned older methods of determining filmstrip visibility, none of which
worked and relied on older code assuming the camera preview was an item
in the filmstrip, including 'sticky' filmstrip item bits. Added a method
to CameraAppUI that proxies the FilmstripLayout visibility, which is
actually what app uses to show/hide the filmstrip.

Bug: 19517380
Change-Id: I5e2a61b55aa2045bfd09f495dd02cdcb9c65dc68

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 21984ed..16ae6d9 100644 (file)
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -904,17 +904,22 @@ public class CameraActivity extends QuickActivity
                         return;
                     }
 
-                    // Make the PhotoItem aware of the session placeholder, to
-                    // allow it to make a smooth transition to its content.
-                    newData.setSessionPlaceholderBitmap(
-                            Storage.getPlaceholderForSession(sessionUri));
-
                     final int pos = mDataAdapter.findByContentUri(sessionUri);
                     if (pos == -1) {
                         // We do not have a placeholder for this image, perhaps
                         // due to the activity crashing or being killed.
                         mDataAdapter.addOrUpdate(newData);
                     } else {
+                        // Make the PhotoItem aware of the session placeholder, to
+                        // allow it to make a smooth transition to its content if it
+                        // the session item is currently visible.
+                        FilmstripItem oldSessionData = mDataAdapter.getFilmstripItemAt(pos);
+                        if (mCameraAppUI.getFilmstripVisibility() == View.VISIBLE
+                                && mFilmstripController.isVisible(oldSessionData)) {
+                            Log.v(TAG, "session item visible, setting transition placeholder");
+                            newData.setSessionPlaceholderBitmap(
+                                    Storage.getPlaceholderForSession(sessionUri));
+                        }
                         mDataAdapter.updateItemAt(pos, newData);
                     }
                 }

diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java
index 252b35c..cd334d7 100644 (file)
--- a/src/com/android/camera/app/CameraAppUI.java
+++ b/src/com/android/camera/app/CameraAppUI.java
@@ -2111,4 +2111,8 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener,
     public void hideFilmstrip() {
         mFilmstripLayout.hideFilmstrip();
     }
+
+    public int getFilmstripVisibility() {
+        return mFilmstripLayout.getVisibility();
+    }
 }

diff --git a/src/com/android/camera/data/FilmstripItemAttributes.java b/src/com/android/camera/data/FilmstripItemAttributes.java
index aea3543..9cd61cc 100644 (file)
--- a/src/com/android/camera/data/FilmstripItemAttributes.java
+++ b/src/com/android/camera/data/FilmstripItemAttributes.java
@@ -34,7 +34,6 @@ public class FilmstripItemAttributes {
         IS_RENDERING,
         IS_IMAGE,
         IS_VIDEO,
-        IS_STICKY,
     }
 
     private final EnumSet<Attributes> mAttributes;
@@ -86,10 +85,6 @@ public class FilmstripItemAttributes {
         return mAttributes.contains(Attributes.IS_VIDEO);
     }
 
-    public boolean isSticky() {
-        return mAttributes.contains(Attributes.IS_STICKY);
-    }
-
     /**
      * Builder for {@code FilmstripItemAttributes}.
      */

diff --git a/src/com/android/camera/filmstrip/FilmstripController.java b/src/com/android/camera/filmstrip/FilmstripController.java
index 8787747..0e517d6 100644 (file)
--- a/src/com/android/camera/filmstrip/FilmstripController.java
+++ b/src/com/android/camera/filmstrip/FilmstripController.java
@@ -16,6 +16,11 @@
 
 package com.android.camera.filmstrip;
 
+import android.view.View;
+
+import com.android.camera.app.CameraAppUI;
+import com.android.camera.data.FilmstripItem;
+
 /**
  * An interface which defines the controller of filmstrip.
  * A filmstrip has 4 states:
@@ -78,16 +83,6 @@ public interface FilmstripController {
     public boolean inFullScreen();
 
     /**
-     * @return Whether the current view in filmstrip is camera preview.
-     */
-    public boolean isCameraPreview();
-
-    /**
-     * @return Whether the filmstrip is in full-screen camera preview.
-     */
-    public boolean inCameraFullscreen();
-
-    /**
      * @return Whether the filmstrip is in scaling animation.
      */
     public boolean isScaling();
@@ -161,6 +156,19 @@ public interface FilmstripController {
     public void goToFullScreen();
 
     /**
+     * Returns true if the supplied element is present and its view reports
+     * {@link View#VISIBLE}, such that it would be visible if onscreen. Note
+     * the filmstrip view itself might not be visible, if caller needs to check
+     * whether the filmstrip is visible, see
+     * {@link CameraAppUI#getFilmstripVisibility()}.
+     *
+     * @param data an item which can be present in the filmstrip.
+     * @return true if the view corresponding to the item has visibility of
+     *              {@link View#VISIBLE}, false otherwise.
+     */
+    public boolean isVisible(FilmstripItem data);
+
+    /**
      * An interface which defines the FilmStripView UI action listener.
      */
     interface FilmstripListener {

diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java
index 905f602..6d0d4fe 100644 (file)
--- a/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@ -433,7 +433,7 @@ public class FilmstripView extends ViewGroup {
          *                          regardless of the view type.
          */
         public void removeViewFromHierarchy(boolean force) {
-            if (force || !mData.getAttributes().isSticky()) {
+            if (force) {
                 mFilmstrip.removeView(mView);
                 mData.recycle(mView);
                 mFilmstrip.recycleView(mView, mIndex);
@@ -974,18 +974,10 @@ public class FilmstripView extends ViewGroup {
         }
 
         boolean stopScroll = false;
-        if (currentItem.getAdapterIndex() == 1 && mCenterX < currentItem.getCenterX()
-              && mAdapterIndexUserIsScrollingOver > 1 &&
-                mDataAdapter.getFilmstripItemAt(0).getAttributes().isSticky() &&
-                mController.isScrolling()) {
+        if (currentItem.getAdapterIndex() == 0 && mCenterX < currentItem.getCenterX()) {
+            // Stop at the first ViewItem.
             stopScroll = true;
-        } else {
-            if (currentItem.getAdapterIndex() == 0 && mCenterX < currentItem.getCenterX()) {
-                // Stop at the first ViewItem.
-                stopScroll = true;
-            }
-        }
-        if (currentItem.getAdapterIndex() == mDataAdapter.getTotalNumber() - 1
+        } else if (currentItem.getAdapterIndex() == mDataAdapter.getTotalNumber() - 1
                 && mCenterX > currentItem.getCenterX()) {
             // Stop at the end.
             stopScroll = true;
@@ -1047,10 +1039,6 @@ public class FilmstripView extends ViewGroup {
         Log.d(TAG, "[fling] Scroll to center.");
         mController.scrollToPosition(currentViewCenter,
               snapInTime, false);
-        if (isViewTypeSticky(currItem) && !mController.isScaling() && mScale != FULL_SCREEN_SCALE) {
-            // Now going to full screen camera
-            mController.goToFullScreen();
-        }
     }
 
     /**
@@ -1196,24 +1184,7 @@ public class FilmstripView extends ViewGroup {
             curr.setLeftPosition(currLeft);
         }
 
-        // Special case for the one immediately on the right of the camera
-        // preview.
-        boolean immediateRight =
-                (mViewItems[BUFFER_CENTER].getAdapterIndex() == 1 &&
-                mDataAdapter.getFilmstripItemAt(0).getAttributes().isSticky());
-
-        // Layout the current ViewItem first.
-        if (immediateRight) {
-            // Just do a simple layout without any special translation or
-            // fading. The implementation in Gallery does not push the first
-            // photo to the bottom of the camera preview. Simply place the
-            // photo on the right of the preview.
-            final ViewItem currItem = mViewItems[BUFFER_CENTER];
-            currItem.setVisibility(View.VISIBLE);
-            currItem.layoutWithTranslationX(mDrawArea, mCenterX, mScale);
-            currItem.setTranslationX(0f);
-            currItem.setAlpha(1f);
-        } else if (scaleFraction == 1f) {
+        if (scaleFraction == 1f) {
             final ViewItem currItem = mViewItems[BUFFER_CENTER];
             final int currCenterX = currItem.getCenterX();
             if (mCenterX < currCenterX) {
@@ -1267,11 +1238,6 @@ public class FilmstripView extends ViewGroup {
             }
 
             curr.layoutWithTranslationX(mDrawArea, mCenterX, mScale);
-            if (curr.getAdapterIndex() == 1 && isViewTypeSticky(curr)) {
-                // Special case for the one next to the camera preview.
-                curr.setAlpha(1f);
-                continue;
-            }
 
             if (scaleFraction == 1) {
                 // It's in full-screen mode.
@@ -1309,13 +1275,6 @@ public class FilmstripView extends ViewGroup {
         stepIfNeeded();
     }
 
-    private boolean isViewTypeSticky(ViewItem item) {
-        if (item == null) {
-            return false;
-        }
-        return mDataAdapter.getFilmstripItemAt(item.getAdapterIndex()).getAttributes().isSticky();
-    }
-
     @Override
     public void onDraw(Canvas c) {
         // TODO: remove layoutViewItems() here.
@@ -1502,10 +1461,6 @@ public class FilmstripView extends ViewGroup {
                 slideViewBack(mViewItems[i]);
             }
         }
-        if (isCurrentItemCentered() && isViewTypeSticky(mViewItems[BUFFER_CENTER])) {
-            // Special case for scrolling onto the camera preview after removal.
-            mController.goToFullScreen();
-        }
     }
 
     // returns -1 on failure.
@@ -1655,15 +1610,6 @@ public class FilmstripView extends ViewGroup {
         return (mScale > FULL_SCREEN_SCALE);
     }
 
-    private boolean isCameraPreview() {
-        return isViewTypeSticky(mViewItems[BUFFER_CENTER]);
-    }
-
-    private boolean inCameraFullscreen() {
-        return isItemAtIndexCentered(0) && inFullScreen()
-                && (isViewTypeSticky(mViewItems[BUFFER_CENTER]));
-    }
-
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (mController.isScrolling()) {
@@ -2007,13 +1953,6 @@ public class FilmstripView extends ViewGroup {
                             renderThumbnail(BUFFER_CENTER - 1);
                             renderThumbnail(BUFFER_CENTER + 2);
                         }
-
-                        if (isCurrentItemCentered()
-                                && isViewTypeSticky(mViewItems[BUFFER_CENTER])) {
-                            // Special case for the scrolling end on the camera
-                            // preview.
-                            goToFullScreen();
-                        }
                     }
                 };
 
@@ -2101,16 +2040,6 @@ public class FilmstripView extends ViewGroup {
         }
 
         @Override
-        public boolean isCameraPreview() {
-            return FilmstripView.this.isCameraPreview();
-        }
-
-        @Override
-        public boolean inCameraFullscreen() {
-            return FilmstripView.this.inCameraFullscreen();
-        }
-
-        @Override
         public void setListener(FilmstripListener listener) {
             FilmstripView.this.setListener(listener);
         }
@@ -2237,7 +2166,7 @@ public class FilmstripView extends ViewGroup {
             }
 
             float scaledVelocityX = velocityX / mScale;
-            if (inFullScreen() && isViewTypeSticky(item) && scaledVelocityX < 0) {
+            if (inFullScreen() && scaledVelocityX < 0) {
                 // Swipe left in camera preview.
                 goToFilmstrip();
             }
@@ -2385,10 +2314,6 @@ public class FilmstripView extends ViewGroup {
             stopScrolling(true);
             scrollToPosition(nextItem.getCenterX(), GEOMETRY_ADJUST_TIME_MS * 2, false);
 
-            if (isViewTypeSticky(mViewItems[BUFFER_CENTER])) {
-                // Special case when moving from camera preview.
-                scaleTo(FILM_STRIP_SCALE, GEOMETRY_ADJUST_TIME_MS);
-            }
             return true;
         }
 
@@ -2414,10 +2339,6 @@ public class FilmstripView extends ViewGroup {
 
             final ViewItem currItem = mViewItems[BUFFER_CENTER];
             final ViewItem nextItem = mViewItems[BUFFER_CENTER + 1];
-            if (currItem.getAdapterIndex() == 0 && isViewTypeSticky(currItem) && nextItem != null) {
-                // Deal with the special case of swiping in camera preview.
-                scrollToPosition(nextItem.getCenterX(), GEOMETRY_ADJUST_TIME_MS, false);
-            }
 
             if (mScale == FILM_STRIP_SCALE) {
                 onLeaveFilmstrip();
@@ -2541,6 +2462,17 @@ public class FilmstripView extends ViewGroup {
         public boolean isZoomAnimationRunning() {
             return mZoomAnimator != null && mZoomAnimator.isRunning();
         }
+
+        @Override
+        public boolean isVisible(FilmstripItem data) {
+            for (ViewItem viewItem : mViewItems) {
+                if (data != null && viewItem != null && viewItem.getVisibility() == VISIBLE
+                        && data.equals(viewItem.mData)) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
     private boolean isCurrentItemCentered() {
@@ -2707,7 +2639,7 @@ public class FilmstripView extends ViewGroup {
             if (inFilmstrip()) {
                 mController.goToFullScreen();
                 return true;
-            } else if (mScale < FULL_SCREEN_SCALE || inCameraFullscreen()) {
+            } else if (mScale < FULL_SCREEN_SCALE) {
                 return false;
             }
             if (!mController.stopScrolling(false)) {
@@ -2787,31 +2719,14 @@ public class FilmstripView extends ViewGroup {
             }
 
             int currId = currItem.getAdapterIndex();
-            if (mCenterX > currItem.getCenterX() + CAMERA_PREVIEW_SWIPE_THRESHOLD && currId == 0 &&
-                    isViewTypeSticky(currItem) && mAdapterIndexUserIsScrollingOver == 0) {
+            if (mAdapterIndexUserIsScrollingOver == 0 && currId != 0) {
+                // Special case to go to filmstrip when the user scroll away
+                // from the camera preview and the current one is not the
+                // preview anymore.
                 mController.goToFilmstrip();
-                // Special case to go from camera preview to the next photo.
-                if (mViewItems[BUFFER_CENTER + 1] != null) {
-                    mController.scrollToPosition(
-                            mViewItems[BUFFER_CENTER + 1].getCenterX(),
-                            GEOMETRY_ADJUST_TIME_MS, false);
-                } else {
-                    // No next photo.
-                    scrollCurrentItemToCenter();
-                }
-            }
-            if (isCurrentItemCentered() && currId == 0 && isViewTypeSticky(currItem)) {
-                mController.goToFullScreen();
-            } else {
-                if (mAdapterIndexUserIsScrollingOver == 0 && currId != 0) {
-                    // Special case to go to filmstrip when the user scroll away
-                    // from the camera preview and the current one is not the
-                    // preview anymore.
-                    mController.goToFilmstrip();
-                    mAdapterIndexUserIsScrollingOver = currId;
-                }
-                scrollCurrentItemToCenter();
+                mAdapterIndexUserIsScrollingOver = currId;
             }
+            scrollCurrentItemToCenter();
             return false;
         }
 
@@ -2983,9 +2898,6 @@ public class FilmstripView extends ViewGroup {
                         }
                         mController.scrollToPosition(
                                 nextItem.getCenterX(), GEOMETRY_ADJUST_TIME_MS, true);
-                        if (isViewTypeSticky(currItem)) {
-                            mController.goToFilmstrip();
-                        }
                     }
                 }
             }
@@ -2999,9 +2911,6 @@ public class FilmstripView extends ViewGroup {
 
         @Override
         public boolean onScaleBegin(float focusX, float focusY) {
-            if (inCameraFullscreen()) {
-                return false;
-            }
             hideZoomView();
 
             // This ensures that the item currently being manipulated
@@ -3020,10 +2929,6 @@ public class FilmstripView extends ViewGroup {
 
         @Override
         public boolean onScale(float focusX, float focusY, float scale) {
-            if (inCameraFullscreen()) {
-                return false;
-            }
-
             mScaleTrend = mScaleTrend * 0.3f + scale * 0.7f;
             float newScale = mScale * scale;
             if (mScale < FULL_SCREEN_SCALE && newScale < FULL_SCREEN_SCALE) {