aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing stutter in AllApps transition" into ics-mr0

Browse Source
This commit is contained in:
Adam Cohen
2011-10-18 12:49:34 -07:00
committed by Android (Google) Code Review
parent dc091f5d85 b64d36e6f8
commit 44fbf9de0e
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/config.xml
View File

@@ -23,8 +23,8 @@
<!-- Fade/zoom in/out duration & scale in the AllApps transition.
Note: This should be less than the workspaceShrinkTime as they happen together. -->
<integer name="config_appsCustomizeZoomInTime">700</integer>
<integer name="config_appsCustomizeZoomOutTime">700</integer>
<integer name="config_appsCustomizeZoomInTime">350</integer>
<integer name="config_appsCustomizeZoomOutTime">600</integer>
<integer name="config_appsCustomizeZoomScaleFactor">7</integer>
<integer name="config_appsCustomizeFadeInTime">250</integer>
<integer name="config_appsCustomizeFadeOutTime">200</integer>

10
src/com/android/launcher2/AppsCustomizePagedView.java
View File

@@ -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() {

3
src/com/android/launcher2/Launcher.java
View File

@@ -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);

4
src/com/android/launcher2/Workspace.java
View File

@@ -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));