diff options
| author | Jack Palevich <jackpal@google.com> | 2010-11-19 13:42:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 13:42:32 -0800 |
| commit | 96b0c1a0eb2160dc4c4b495ba4a617214f1ee50c (patch) | |
| tree | d285fd897fbc6985d1eb453346c26b1bce03dcc8 | |
| parent | b7c0cb73d913a2523f22c684ce730b86c2b9f047 (diff) | |
| parent | aa6b30c7d17f7d4ef197b4a4c8aec29ce9c6b5a7 (diff) | |
| download | Gallery3D-96b0c1a0eb2160dc4c4b495ba4a617214f1ee50c.tar.gz | |
am aa6b30c7: Merge "Gallery3D: Add depth component to icon animation"
* commit 'aa6b30c7d17f7d4ef197b4a4c8aec29ce9c6b5a7':
Gallery3D: Add depth component to icon animation
| -rw-r--r-- | src/com/cooliris/media/GridLayer.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/cooliris/media/GridLayer.java b/src/com/cooliris/media/GridLayer.java index 74aff5d..1bf7ebc 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.5f; private MediaFeed mMediaFeed; private boolean mInAlbum = false; @@ -678,6 +679,14 @@ 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 + && !isTouchPressed + && !isBarDragged) { + displayItem.mAnimatedPosition.add( + 0.0f, 0.0f, i * DEPTH_POSITION); + } displayList.setPositionAndStackIndex(displayItem, position, j, true); } displayItems[baseIndex + j] = displayItem; |