diff options
| author | Winson Chung <winsonc@google.com> | 2010-10-21 11:55:00 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2010-10-21 14:32:20 -0700 |
| commit | ef0066b52d2754ca0553ec79613c650b5649afaa (patch) | |
| tree | 879a087ab89f8a69b8c421f28089a4657e6c2060 /src/com/android | |
| parent | f3ca3ab6958b104cbf2c2fa04add97d372a94d1c (diff) | |
| download | packages_apps_trebuchet-ef0066b52d2754ca0553ec79613c650b5649afaa.zip packages_apps_trebuchet-ef0066b52d2754ca0553ec79613c650b5649afaa.tar.gz packages_apps_trebuchet-ef0066b52d2754ca0553ec79613c650b5649afaa.tar.bz2 | |
More spacing changes to Customization Drawer.
Change-Id: Ie51a0a5da6169b0651e9f70cfb28450254cf0df1
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/CustomizePagedView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java index cc21276..a01f1c0 100644 --- a/src/com/android/launcher2/CustomizePagedView.java +++ b/src/com/android/launcher2/CustomizePagedView.java @@ -539,6 +539,7 @@ public class CustomizePagedView extends PagedView layout.setCellCount(mCellCountX, mCellCountY); layout.setPadding(mPageLayoutPaddingLeft, mPageLayoutPaddingTop, mPageLayoutPaddingRight, mPageLayoutPaddingBottom); + layout.setGap(mPageLayoutWidthGap, mPageLayoutHeightGap); } private void setupWorkspaceLayout() { @@ -557,6 +558,8 @@ public class CustomizePagedView extends PagedView for (int i = 0; i < numPages; ++i) { LinearLayout layout = new PagedViewWidgetLayout(getContext()); layout.setGravity(Gravity.CENTER_HORIZONTAL); + layout.setPadding(mPageLayoutPaddingLeft, mPageLayoutPaddingTop, + mPageLayoutPaddingRight, mPageLayoutPaddingBottom); // Temporary change to prevent the last page from being too small (and items bleeding // onto it). We can remove this once we properly fix the fading algorithm diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 44127fe..56e78c3 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -718,8 +718,8 @@ public class Workspace extends SmoothPagedView boolean isPortrait = getMeasuredHeight() > getMeasuredWidth(); float newY = (isPortrait ? - getResources().getDimension(R.dimen.smallScreenVerticalMarginPortrait) : - getResources().getDimension(R.dimen.smallScreenVerticalMarginLandscape)); + getResources().getDimension(R.dimen.allAppsSmallScreenVerticalMarginPortrait) : + getResources().getDimension(R.dimen.allAppsSmallScreenVerticalMarginLandscape)); float finalAlpha = 1.0f; float extraShrinkFactor = 1.0f; if (shrinkPosition == ShrinkPosition.SHRINK_TO_BOTTOM_VISIBLE) { @@ -735,7 +735,9 @@ public class Workspace extends SmoothPagedView newY = screenHeight / 2 - scaledPageHeight / 2; finalAlpha = 1.0f; } else if (shrinkPosition == ShrinkPosition.SHRINK_TO_TOP) { - newY = screenHeight / 10; + newY = (isPortrait ? + getResources().getDimension(R.dimen.customizeSmallScreenVerticalMarginPortrait) : + getResources().getDimension(R.dimen.customizeSmallScreenVerticalMarginLandscape)); } // We animate all the screens to the centered position in workspace |