diff options
| author | Jack Palevich <jackpal@google.com> | 2010-11-19 14:05:58 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-19 14:05:58 -0800 |
| commit | 4b47e1bb8512b46555bc0bb863a72c593dbc3735 (patch) | |
| tree | a26da76bafe41e6a52cc502e96ca4a06061791a6 | |
| parent | aa6b30c7d17f7d4ef197b4a4c8aec29ce9c6b5a7 (diff) | |
| parent | c0cc46f3606ad0625050bb53e6875920488d6f1f (diff) | |
| download | Gallery3D-4b47e1bb8512b46555bc0bb863a72c593dbc3735.tar.gz | |
Merge "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; |