diff options
author | Adam Cohen <adamcohen@google.com> | 2011-10-18 12:49:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-18 12:49:34 -0700 |
commit | 44fbf9de0e4694d785383b6c276cc24f86923118 (patch) | |
tree | 965962b9e8fc69db9963b947c7d8a79aa1dd575f /src/com/android/launcher2 | |
parent | dc091f5d85b2d069fda545d8450269c3bc75615e (diff) | |
parent | b64d36e6f8006b3ea5a6c2951af4cf8dea72d08e (diff) | |
download | android_packages_apps_Trebuchet-44fbf9de0e4694d785383b6c276cc24f86923118.tar.gz android_packages_apps_Trebuchet-44fbf9de0e4694d785383b6c276cc24f86923118.tar.bz2 android_packages_apps_Trebuchet-44fbf9de0e4694d785383b6c276cc24f86923118.zip |
Merge "Fixing stutter in AllApps transition" into ics-mr0
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 10 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 4f5d83599..7bc4b511b 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -1360,8 +1360,14 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen @Override public void reset() { - updateCurrentTab(0); - invalidatePageData(0); + AppsCustomizeTabHost tabHost = getTabHost(); + String tag = tabHost.getCurrentTabTag(); + if (!tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) { + tabHost.setCurrentTabFromContent(ContentType.Applications); + } + if (mCurrentPage != 0) { + invalidatePageData(0); + } } private AppsCustomizeTabHost getTabHost() { diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index dc7b77e86..02f19ac09 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1209,7 +1209,7 @@ public final class Launcher extends Activity } // Reset AllApps to its initial state - if (mAppsCustomizeTabHost != null) { + if (!alreadyOnHome && mAppsCustomizeTabHost != null) { mAppsCustomizeTabHost.reset(); } } @@ -2187,7 +2187,6 @@ public final class Launcher extends Activity // Shrink workspaces away if going to AppsCustomize from workspace mWorkspace.changeState(Workspace.State.SMALL, animated); - //hideHotseat(animated); if (animated) { final ValueAnimator scaleAnim = ValueAnimator.ofFloat(0f, 1f).setDuration(duration); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 8a492a28e..d1f9617ac 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1421,8 +1421,8 @@ public class Workspace extends SmoothPagedView * ZInterpolator compounded with an ease-out. */ static class ZoomOutInterpolator implements TimeInterpolator { - private final ZInterpolator zInterpolator = new ZInterpolator(0.2f); - private final DecelerateInterpolator decelerate = new DecelerateInterpolator(1.8f); + private final DecelerateInterpolator decelerate = new DecelerateInterpolator(0.75f); + private final ZInterpolator zInterpolator = new ZInterpolator(0.13f); public float getInterpolation(float input) { return decelerate.getInterpolation(zInterpolator.getInterpolation(input)); |