Forgot to repo upload --amend. Yay.
This commit is contained in:
+2
-1
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user