diff options
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 0766d7624..497828125 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -14,6 +14,8 @@ <!-- The alpha of the AppsCustomize bg in spring loaded mode --> <integer name="config_appsCustomizeSpringLoadedBgAlpha">65</integer> <integer name="config_workspaceUnshrinkTime">300</integer> + <integer name="config_overviewTransitionTime">250</integer> + <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer> <!-- Out of 100, the percent to shrink the workspace during overview mode. --> diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 4f263d0a3..1d5b5ac90 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1996,9 +1996,15 @@ public class Workspace extends SmoothPagedView } } - final int duration = workspaceToAllApps ? - getResources().getInteger(R.integer.config_workspaceUnshrinkTime) : - getResources().getInteger(R.integer.config_appsCustomizeWorkspaceShrinkTime); + final int duration; + if (workspaceToAllApps) { + duration = getResources().getInteger(R.integer.config_workspaceUnshrinkTime); + } else if (workspaceToOverview || overviewToWorkspace) { + duration = getResources().getInteger(R.integer.config_overviewTransitionTime); + } else { + duration = getResources().getInteger(R.integer.config_appsCustomizeWorkspaceShrinkTime); + } + for (int i = 0; i < getChildCount(); i++) { final CellLayout cl = (CellLayout) getChildAt(i); boolean isCurrentPage = (i == getNextPage()); @@ -2033,6 +2039,7 @@ public class Workspace extends SmoothPagedView final View overviewPanel = mLauncher.getOverviewPanel(); final View hotseat = mLauncher.getHotseat(); if (animated) { + anim.setDuration(duration); LauncherViewPropertyAnimator scale = new LauncherViewPropertyAnimator(this); scale.scaleX(mNewScale) .scaleY(mNewScale) @@ -2051,14 +2058,13 @@ public class Workspace extends SmoothPagedView LauncherViewPropertyAnimator alphaAnim = new LauncherViewPropertyAnimator(cl.getShortcutsAndWidgets()); alphaAnim.alpha(mNewAlphas[i]) - .setDuration(duration) .setInterpolator(mZoomInInterpolator); anim.play(alphaAnim); } if (mOldBackgroundAlphas[i] != 0 || mNewBackgroundAlphas[i] != 0) { ValueAnimator bgAnim = - LauncherAnimUtils.ofFloat(cl, 0f, 1f).setDuration(duration); + LauncherAnimUtils.ofFloat(cl, 0f, 1f); bgAnim.setInterpolator(mZoomInInterpolator); bgAnim.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { |