PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problems with unanimated toolbar transitions.

Browse Source 
Rather than creating all the Animators and attempting to execute the
transitions immediately, add a separate code path for all the
unanimated cases.

Change-Id: Id615180bd0d2ed5cc60d8df351c00e8d7b13c68d
This commit is contained in:
Patrick Dubroy
2010-08-26 17:52:56 -07:00
parent 07a0de4bc4
commit df7c3a7853
2 changed files with 165 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+9 -11
View File
@@ -17,12 +17,12 @@
package com.android.launcher2;
import com.android.launcher.R;
import com.android.launcher2.CellLayout.CellInfo;
import android.animation.Animatable;
import android.animation.PropertyAnimator;
import android.animation.Sequencer;
import android.animation.Animatable.AnimatableListener;
import android.animation.PropertyAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.Sequencer;
import android.app.WallpaperManager;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
@@ -1124,19 +1124,18 @@ public class Workspace extends ViewGroup
// newX is initialized to the left-most position of the centered screens
float newX = (mCurrentScreen + 1) * screenWidth - screenWidth / 2 - totalWidth / 2;
Sequencer s = new Sequencer();
for (int i = 0; i < screenCount; i++) {
CellLayout cl = (CellLayout) getChildAt(i);
cl.setPivotX(0.0f);
cl.setPivotY(0.0f);
if (animated) {
final int duration = res.getInteger(R.integer.config_workspaceShrinkTime);
s.playTogether(
new PropertyAnimator(duration, cl, "x", newX),
new PropertyAnimator(duration, cl, "y", newY),
new PropertyAnimator(duration, cl, "scaleX", SHRINK_FACTOR),
new PropertyAnimator(duration, cl, "scaleY", SHRINK_FACTOR),
new PropertyAnimator(duration, cl, "dimmedBitmapAlpha", 1.0f));
new PropertyAnimator(duration, cl,
new PropertyValuesHolder("x", newX),
new PropertyValuesHolder("y", newY),
new PropertyValuesHolder("scaleX", SHRINK_FACTOR),
new PropertyValuesHolder("scaleY", SHRINK_FACTOR),
new PropertyValuesHolder("dimmedBitmapAlpha", 1.0f)).start();
} else {
cl.setX((int)newX);
cl.setY((int)newY);
@@ -1149,7 +1148,6 @@ public class Workspace extends ViewGroup
cl.setOnInterceptTouchListener(this);
}
setChildrenDrawnWithCacheEnabled(true);
if (animated) s.start();
}
// We call this when we trigger an unshrink by clicking on the CellLayout cl