diff options
author | Jack Palevich <jackpal@google.com> | 2010-11-22 16:36:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-22 16:36:18 -0800 |
commit | 6be25617a0a39bcce5846dbd5a43a6ba896dfba7 (patch) | |
tree | 2bbd7e8b24ea16b8a9160aadf3ee13ac03579931 | |
parent | 571a4334340b16b084f2c12347b0ef4f72b3c75e (diff) | |
parent | 4b445dfd349a40d51c85070451518374306eda96 (diff) | |
download | Gallery3D-6be25617a0a39bcce5846dbd5a43a6ba896dfba7.tar.gz |
am 4b445dfd: Merge "Gallery3D: Add depth component to icon animation"
* commit '4b445dfd349a40d51c85070451518374306eda96':
Gallery3D: Add depth component to icon animation
-rw-r--r-- | src/com/cooliris/media/GridLayer.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/cooliris/media/GridLayer.java b/src/com/cooliris/media/GridLayer.java index 74aff5d..b8c2f75 100644 --- a/src/com/cooliris/media/GridLayer.java +++ b/src/com/cooliris/media/GridLayer.java @@ -82,6 +82,7 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti private final LayoutInterface mLayoutInterface; private static final LayoutInterface sfullScreenLayoutInterface = new GridLayoutInterface(1); + private static final float DEPTH_POSITION = 0.55f; private MediaFeed mMediaFeed; private boolean mInAlbum = false; @@ -116,6 +117,7 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti private String mRequestFocusContentUri; private int mFrameCount; private boolean mRequestToEnterSelection; + private boolean mLayoutChanged = false; // private ArrayList<Integer> mBreakSlots = new ArrayList<Integer>(); // private ArrayList<Integer> mOldBreakSlots; @@ -678,6 +680,13 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti displayItem.set(position, j, false); displayItem.commit(); } else { + boolean isTouchPressed = mInputProcessor.touchPressed(); + boolean isBarDragged = mHud.getTimeBar().isDragged(); + if (mState == STATE_GRID_VIEW + && mLayoutChanged) { + displayItem.mAnimatedPosition.add( + 0.0f, 0.0f, (i % 5) * DEPTH_POSITION); + } displayList.setPositionAndStackIndex(displayItem, position, j, true); } displayItems[baseIndex + j] = displayItem; @@ -690,6 +699,7 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti bestItems.clear(); } } + mLayoutChanged = false; if (mFeedChanged) { mFeedChanged = false; if (mInputProcessor != null && mState == STATE_FULL_SCREEN && mRequestFocusContentUri == null) { @@ -872,6 +882,7 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti deltaAnchorPosition.subtract(currentSlotPosition); deltaAnchorPosition.y = 0; deltaAnchorPosition.z = 0; + mLayoutChanged = true; } mDeltaAnchorPositionUncommited.set(deltaAnchorPosition); } finally { |