summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-05-16 21:01:01 -0700
committerAdam Cohen <adamcohen@google.com>2012-05-16 21:01:37 -0700
commit3aff81c759a2912bed45643f7e1fb503fcfe69b0 (patch)
treee7d3338c3490968dedf474966882293760108b33 /src
parent65dbf3e454a94869cf28a6bd349b40e8e79d1ccf (diff)
downloadandroid_packages_apps_Trebuchet-3aff81c759a2912bed45643f7e1fb503fcfe69b0.tar.gz
android_packages_apps_Trebuchet-3aff81c759a2912bed45643f7e1fb503fcfe69b0.tar.bz2
android_packages_apps_Trebuchet-3aff81c759a2912bed45643f7e1fb503fcfe69b0.zip
Tweak folder creation threshold (issue 6443778)
Change-Id: I7bd4ec5da5181032d2e0891a0ac8fca35454efa4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 00684bdfc..905ad8a89 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -76,7 +76,6 @@ public class Workspace extends SmoothPagedView
private static final String TAG = "Launcher.Workspace";
// Y rotation to apply to the workspace screens
- private static final float WORKSPACE_ROTATION = 12.5f;
private static final float WORKSPACE_OVERSCROLL_ROTATION = 24f;
private static float CAMERA_DISTANCE = 6500;
@@ -88,8 +87,6 @@ public class Workspace extends SmoothPagedView
private static final int ADJACENT_SCREEN_DROP_DURATION = 300;
private static final int FLING_THRESHOLD_VELOCITY = 500;
- private float mMaxDistanceForFolderCreation;
-
// These animators are used to fade the children's outlines
private ObjectAnimator mChildrenOutlineFadeInAnimation;
private ObjectAnimator mChildrenOutlineFadeOutAnimation;
@@ -102,7 +99,6 @@ public class Workspace extends SmoothPagedView
boolean mDrawBackground = true;
private float mBackgroundAlpha = 0;
private float mOverScrollMaxBackgroundAlpha = 0.0f;
- private int mOverScrollPageIndex = -1;
private float mWallpaperScrollRatio = 1.0f;
@@ -211,6 +207,7 @@ public class Workspace extends SmoothPagedView
private boolean mCreateUserFolderOnDrop = false;
private boolean mAddToExistingFolderOnDrop = false;
private DropTarget.DragEnforcer mDragEnforcer;
+ private float mMaxDistanceForFolderCreation;
// Variables relating to touch disambiguation (scrolling workspace vs. scrolling a widget)
private float mXDown;
@@ -250,7 +247,6 @@ public class Workspace extends SmoothPagedView
private float[] mOldScaleYs;
private float[] mOldBackgroundAlphas;
private float[] mOldAlphas;
- private float[] mOldRotationYs;
private float[] mNewTranslationXs;
private float[] mNewTranslationYs;
private float[] mNewScaleXs;
@@ -432,7 +428,7 @@ public class Workspace extends SmoothPagedView
mWallpaperTravelWidth = (int) (mDisplaySize.x *
wallpaperTravelToScreenWidthRatio(mDisplaySize.x, mDisplaySize.y));
- mMaxDistanceForFolderCreation = (0.6f * res.getDimensionPixelSize(R.dimen.app_icon_size));
+ mMaxDistanceForFolderCreation = (0.55f * res.getDimensionPixelSize(R.dimen.app_icon_size));
mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
}
@@ -776,7 +772,6 @@ public class Workspace extends SmoothPagedView
}
}
mOverScrollMaxBackgroundAlpha = 0.0f;
- mOverScrollPageIndex = -1;
if (mDelayedResizeRunnable != null) {
mDelayedResizeRunnable.run();
@@ -1508,7 +1503,6 @@ public class Workspace extends SmoothPagedView
mOldScaleYs = new float[childCount];
mOldBackgroundAlphas = new float[childCount];
mOldAlphas = new float[childCount];
- mOldRotationYs = new float[childCount];
mNewTranslationXs = new float[childCount];
mNewTranslationYs = new float[childCount];
mNewScaleXs = new float[childCount];