Merge "Fixing two regressions in which side pages were not drawn or oriented correctly."
This commit is contained in:
@@ -766,8 +766,8 @@ public abstract class PagedView extends ViewGroup {
|
|||||||
// View.INVISIBLE, preventing re-drawing of their hardware layer
|
// View.INVISIBLE, preventing re-drawing of their hardware layer
|
||||||
for (int i = getChildCount() - 1; i >= 0; i--) {
|
for (int i = getChildCount() - 1; i >= 0; i--) {
|
||||||
final View v = getPageAt(i);
|
final View v = getPageAt(i);
|
||||||
if (leftScreen <= i && i <= rightScreen &&
|
|
||||||
v.getAlpha() > ViewConfiguration.ALPHA_THRESHOLD) {
|
if (leftScreen <= i && i <= rightScreen) {
|
||||||
v.setVisibility(VISIBLE);
|
v.setVisibility(VISIBLE);
|
||||||
drawChild(canvas, v, drawingTime);
|
drawChild(canvas, v, drawingTime);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1660,7 +1660,7 @@ public class Workspace extends SmoothPagedView
|
|||||||
rotate.setInterpolator(new DecelerateInterpolator(2.0f));
|
rotate.setInterpolator(new DecelerateInterpolator(2.0f));
|
||||||
rotate.addUpdateListener(new LauncherAnimatorUpdateListener() {
|
rotate.addUpdateListener(new LauncherAnimatorUpdateListener() {
|
||||||
public void onAnimationUpdate(float a, float b) {
|
public void onAnimationUpdate(float a, float b) {
|
||||||
cl.setRotationY(a * 0f + b * 1f);
|
cl.setRotationY(a * mOldRotationYs[i] + b * mNewRotationYs[i]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
anim.play(rotate);
|
anim.play(rotate);
|
||||||
|
|||||||
Reference in New Issue
Block a user