diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-11 16:27:49 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-05-14 15:25:23 -0700 |
| commit | 8aad610dc58d810ec848a579c548f50c613c8641 (patch) | |
| tree | 322bc6b1874cda63db77cd89451dff8354a60547 /src/com/android/launcher2/Workspace.java | |
| parent | 0e56cc9fd6814af5813e73ba7a71bf1d51d4208a (diff) | |
| download | android_packages_apps_Trebuchet-8aad610dc58d810ec848a579c548f50c613c8641.tar.gz android_packages_apps_Trebuchet-8aad610dc58d810ec848a579c548f50c613c8641.tar.bz2 android_packages_apps_Trebuchet-8aad610dc58d810ec848a579c548f50c613c8641.zip | |
Making the page spacing fixed in spring loaded mode. (Bug 6478409)
Change-Id: I3577a1beecacb82528f0fde9439a8366a709b29c
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 3910c45cf..06c37ccc5 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -199,6 +199,7 @@ public class Workspace extends SmoothPagedView private Point mDisplaySize = new Point(); private boolean mIsStaticWallpaper; private int mWallpaperTravelWidth; + private int mSpringLoadedPageSpacing; // Variables relating to the creation of user folders by hovering shortcuts over shortcuts private static final int FOLDER_CREATION_TIMEOUT = 0; @@ -322,6 +323,8 @@ public class Workspace extends SmoothPagedView mSpringLoadedShrinkFactor = res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f; + mSpringLoadedPageSpacing = + res.getDimensionPixelSize(R.dimen.workspace_spring_loaded_page_spacing); // if the value is manually specified, use that instead cellCountX = a.getInt(R.styleable.Workspace_cellCountX, cellCountX); @@ -1536,6 +1539,7 @@ public class Workspace extends SmoothPagedView if (state != State.NORMAL) { finalScaleFactor = mSpringLoadedShrinkFactor - (stateIsSmall ? 0.1f : 0); + setPageSpacing(mSpringLoadedPageSpacing); if (oldStateIsNormal && stateIsSmall) { zoomIn = false; setLayoutScale(finalScaleFactor); @@ -1545,6 +1549,7 @@ public class Workspace extends SmoothPagedView setLayoutScale(finalScaleFactor); } } else { + setPageSpacing(PagedView.AUTOMATIC_PAGE_SPACING); setLayoutScale(1.0f); } |