diff options
| author | Romain Guy <romainguy@google.com> | 2010-10-15 13:57:28 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2010-10-15 13:57:28 -0700 |
| commit | e5ebcb0107a939395e03592fd44c746cd09e311d (patch) | |
| tree | 1ee2cc9fb92d3de28f40658df2a7df1da79f64f8 /core/java/android/widget/StackView.java | |
| parent | c65217e4ec3e6c80834988ec3bc66a90778ee4b0 (diff) | |
Fix clipping issue in StackView.
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
Diffstat (limited to 'core/java/android/widget/StackView.java')
| -rw-r--r-- | core/java/android/widget/StackView.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java index 7e0150637850..1f5b79087c3b 100644 --- a/core/java/android/widget/StackView.java +++ b/core/java/android/widget/StackView.java @@ -16,10 +16,9 @@ package android.widget; -import android.animation.PropertyValuesHolder; import android.animation.ObjectAnimator; +import android.animation.PropertyValuesHolder; import android.content.Context; -import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BlurMaskFilter; import android.graphics.Canvas; @@ -31,15 +30,12 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.TableMaskFilter; import android.util.AttributeSet; -import android.util.DisplayMetrics; import android.util.Log; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; import android.view.ViewGroup; -import android.view.View.MeasureSpec; -import android.view.ViewGroup.LayoutParams; import android.view.animation.LinearInterpolator; import android.widget.RemoteViews.RemoteView; @@ -54,13 +50,14 @@ public class StackView extends AdapterViewAnimator { /** * Default animation parameters */ - private final int DEFAULT_ANIMATION_DURATION = 400; - private final int MINIMUM_ANIMATION_DURATION = 50; + private static final int DEFAULT_ANIMATION_DURATION = 400; + private static final int MINIMUM_ANIMATION_DURATION = 50; /** * Parameters effecting the perspective visuals */ private static float PERSPECTIVE_SHIFT_FACTOR = 0.12f; + @SuppressWarnings({"FieldCanBeLocal"}) private static float PERSPECTIVE_SCALE_FACTOR = 0.35f; /** @@ -182,7 +179,6 @@ public class StackView extends AdapterViewAnimator { // Slide item in view.setVisibility(VISIBLE); - LayoutParams lp = (LayoutParams) view.getLayoutParams(); int duration = Math.round(mStackSlider.getDurationForNeutralPosition(mYVelocity)); StackSlider animationSlider = new StackSlider(mStackSlider); @@ -195,8 +191,6 @@ public class StackView extends AdapterViewAnimator { pa.start(); } else if (fromIndex == mNumActiveViews - 2 && toIndex == mNumActiveViews - 1) { // Slide item out - LayoutParams lp = (LayoutParams) view.getLayoutParams(); - int duration = Math.round(mStackSlider.getDurationForOffscreenPosition(mYVelocity)); StackSlider animationSlider = new StackSlider(mStackSlider); @@ -730,10 +724,14 @@ public class StackView extends AdapterViewAnimator { return 0; } + // Used for animations + @SuppressWarnings({"UnusedDeclaration"}) public float getYProgress() { return mYProgress; } + // Used for animations + @SuppressWarnings({"UnusedDeclaration"}) public float getXProgress() { return mXProgress; } |
