From d40eec360f86d8f3d7f9229dbfdc1e54628bfa8a Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 8 Sep 2009 12:34:22 -0700 Subject: [PATCH] Forgot to repo upload --amend. Yay. --- res/raw/rollo.c | 3 ++- src/com/android/launcher2/Launcher.java | 3 --- src/com/android/launcher2/Workspace.java | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/res/raw/rollo.c b/res/raw/rollo.c index e9c31b1ecc..dc1199e410 100644 --- a/res/raw/rollo.c +++ b/res/raw/rollo.c @@ -98,6 +98,7 @@ draw_page(int icon, int lastIcon, float centerAngle) float iconTop = (farIconSize + iconGutterHeight) * (2.0f + ICON_TOP_OFFSET) - row * (farIconSize + iconGutterHeight); + iconTop -= 6 * scale; // make the zoom point below center float iconBottom = iconTop - farIconSize; float labelTop = iconBottom - (.1 * farLabelHeight); @@ -113,7 +114,7 @@ draw_page(int icon, int lastIcon, float centerAngle) float centerX = sine * RADIUS; float centerZ = cosine * RADIUS; - centerZ -= (7*scale); + centerZ -= ((RADIUS+2+1)*scale); // 2 is camera loc, 1 put it slightly behind that. float iconLeftX = centerX - (cosine * farIconTextureSize * .5); float iconRightX = centerX + (cosine * farIconTextureSize * .5); diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 86914b0cd2..ec3622c61f 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -393,8 +393,6 @@ public final class Launcher extends Activity protected void onResume() { super.onResume(); - Log.d(TAG, "onResume mRestoring=" + mRestoring); - if (mRestoring) { mWorkspaceLoading = true; mModel.startLoader(this, true); @@ -1619,7 +1617,6 @@ public final class Launcher extends Activity void closeAllAppsDialog(boolean animated) { if (mAllAppsVisible) { - Log.d(LOG_TAG, "closing all apps"); mAllAppsGrid.hide(); mAllAppsVisible = false; mWorkspace.getChildAt(mWorkspace.getCurrentScreen()).requestFocus(); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 14b77f0375..c6def180b1 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -495,10 +495,12 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag if (scale < 0.999f) { int w = getWidth(); w += 2 * mCurrentScreen * w; + int dx = w/2; int h = getHeight(); - canvas.translate(w/2, h/2); + int dy = (h/2) - (h/4); + canvas.translate(dx, dy); canvas.scale(scale, scale); - canvas.translate(-w/2, -h/2); + canvas.translate(-dx, -dy); } }