diff options
author | Adam Cohen <adamcohen@google.com> | 2011-04-21 16:19:16 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-04-21 17:14:26 -0700 |
commit | 7f4eabe3709a72b416569136e4a095431c493c8b (patch) | |
tree | cf39d81a9a28c85ee3118727c3f679db9c8d00b1 /src/com/android/launcher2/CellLayoutChildren.java | |
parent | f579b5041afe8272c79f9f13001120d37eeeee7b (diff) | |
download | android_packages_apps_Trebuchet-7f4eabe3709a72b416569136e4a095431c493c8b.tar.gz android_packages_apps_Trebuchet-7f4eabe3709a72b416569136e4a095431c493c8b.tar.bz2 android_packages_apps_Trebuchet-7f4eabe3709a72b416569136e4a095431c493c8b.zip |
Adding initial folder animation
-Changed CellLayout/CellLayoutChildren to use padding in the more
standard way
Change-Id: I728f1b699232422be76eb29b4cf710cd5723a0aa
Diffstat (limited to 'src/com/android/launcher2/CellLayoutChildren.java')
-rw-r--r-- | src/com/android/launcher2/CellLayoutChildren.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java index ed814199c..eea38f142 100644 --- a/src/com/android/launcher2/CellLayoutChildren.java +++ b/src/com/android/launcher2/CellLayoutChildren.java @@ -34,9 +34,6 @@ public class CellLayoutChildren extends ViewGroup { private final WallpaperManager mWallpaperManager; - private int mLeftPadding; - private int mTopPadding; - private int mCellWidth; private int mCellHeight; @@ -49,12 +46,9 @@ public class CellLayoutChildren extends ViewGroup { setLayerType(LAYER_TYPE_HARDWARE, null); } - public void setCellDimensions(int cellWidth, int cellHeight, - int leftPadding, int topPadding, int widthGap, int heightGap ) { + public void setCellDimensions(int cellWidth, int cellHeight, int widthGap, int heightGap ) { mCellWidth = cellWidth; mCellHeight = cellHeight; - mLeftPadding = leftPadding; - mTopPadding = topPadding; mWidthGap = widthGap; mHeightGap = heightGap; } @@ -90,9 +84,7 @@ public class CellLayoutChildren extends ViewGroup { final int cellHeight = mCellHeight; CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams(); - lp.setup(cellWidth, cellHeight, mWidthGap, mHeightGap, - mLeftPadding, mTopPadding); - + lp.setup(cellWidth, cellHeight, mWidthGap, mHeightGap); int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY); int childheightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY); |