diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-08 17:10:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-08 17:10:21 -0700 |
| commit | 13a81aad3dcc2f0410ffe624e3666a15ee9c82dd (patch) | |
| tree | 187b8eff6c0244fea9477cd31164c1d9e0758d3a /core/java | |
| parent | 3d265b5775a74b1d5eb726238f13cf63e8465594 (diff) | |
| parent | f6859c3da7813399240a3bd75a16c251e15735f8 (diff) | |
| download | frameworks_base-13a81aad3dcc2f0410ffe624e3666a15ee9c82dd.zip frameworks_base-13a81aad3dcc2f0410ffe624e3666a15ee9c82dd.tar.gz frameworks_base-13a81aad3dcc2f0410ffe624e3666a15ee9c82dd.tar.bz2 | |
Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/EdgeGlow.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/widget/EdgeGlow.java b/core/java/android/widget/EdgeGlow.java index 7a990ad..8d14462 100644 --- a/core/java/android/widget/EdgeGlow.java +++ b/core/java/android/widget/EdgeGlow.java @@ -145,10 +145,9 @@ public class EdgeGlow { mEdgeScaleY = mEdgeScaleYStart = Math.max( HELD_EDGE_SCALE_Y, Math.min(distance * PULL_DISTANCE_EDGE_FACTOR, 1.f)); - mGlowAlpha = mGlowAlphaStart = Math.min( + mGlowAlpha = mGlowAlphaStart = Math.min(MAX_ALPHA, mGlowAlpha + - (Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR), - MAX_ALPHA); + (Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR)); float glowChange = Math.abs(deltaDistance); if (deltaDistance > 0 && mPullDistance < 0) { @@ -157,8 +156,10 @@ public class EdgeGlow { if (mPullDistance == 0) { mGlowScaleY = 0; } - mGlowScaleY = mGlowScaleYStart = Math.max( - 0, mGlowScaleY + glowChange * PULL_DISTANCE_GLOW_FACTOR); + + // Do not allow glow to get larger than MAX_GLOW_HEIGHT. + mGlowScaleY = mGlowScaleYStart = Math.min(MAX_GLOW_HEIGHT, Math.max( + 0, mGlowScaleY + glowChange * PULL_DISTANCE_GLOW_FACTOR)); mEdgeAlphaFinish = mEdgeAlpha; mEdgeScaleYFinish = mEdgeScaleY; |