diff options
author | Joe Onorato <joeo@android.com> | 2009-09-08 12:34:22 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-09-11 12:41:13 -0400 |
commit | d40eec360f86d8f3d7f9229dbfdc1e54628bfa8a (patch) | |
tree | 8273b9040244e7c65e6063dd5424d94da3f161e1 /src/com/android/launcher2 | |
parent | 4aed02675d314697368e879781314f28507d5563 (diff) | |
download | android_packages_apps_Trebuchet-d40eec360f86d8f3d7f9229dbfdc1e54628bfa8a.tar.gz android_packages_apps_Trebuchet-d40eec360f86d8f3d7f9229dbfdc1e54628bfa8a.tar.bz2 android_packages_apps_Trebuchet-d40eec360f86d8f3d7f9229dbfdc1e54628bfa8a.zip |
Forgot to repo upload --amend. Yay.
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 86914b0cd..ec3622c61 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 14b77f037..c6def180b 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); } } |