diff options
| author | Jack Palevich <jackpal@google.com> | 2010-11-19 14:18:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 14:18:07 -0800 |
| commit | 571a4334340b16b084f2c12347b0ef4f72b3c75e (patch) | |
| tree | ac4b036b24ca399d8559cfbc80aa805827c75f79 | |
| parent | 96b0c1a0eb2160dc4c4b495ba4a617214f1ee50c (diff) | |
| parent | 4b47e1bb8512b46555bc0bb863a72c593dbc3735 (diff) | |
| download | Gallery3D-571a4334340b16b084f2c12347b0ef4f72b3c75e.tar.gz | |
am 4b47e1bb: Merge "Revert "Gallery3D: Add depth component to icon animation""
* commit '4b47e1bb8512b46555bc0bb863a72c593dbc3735':
Revert "Gallery3D: Add depth component to icon animation"
| -rw-r--r-- | src/com/cooliris/media/GridLayer.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/cooliris/media/GridLayer.java b/src/com/cooliris/media/GridLayer.java index 1bf7ebc..74aff5d 100644 --- a/src/com/cooliris/media/GridLayer.java +++ b/src/com/cooliris/media/GridLayer.java @@ -82,7 +82,6 @@ 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; @@ -679,14 +678,6 @@ 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; |