Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread

Browse Source 
Merge commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd' into gingerbread-plus-aosp

* commit '13a81aad3dcc2f0410ffe624e3666a15ee9c82dd':
  DO NOT MERGE Limit the height of the pull glow.
This commit is contained in:
Mindy Pereira
2010-10-08 17:14:56 -07:00
committed by Android Git Automerger
parent 59d5d96666 13a81aad3d
commit 37c8ad779f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/EdgeGlow.java
View File

@@ -145,10 +145,9 @@ public class EdgeGlow {
mEdgeScaleY = mEdgeScaleYStart = Math.max( mEdgeScaleY = mEdgeScaleYStart = Math.max(
HELD_EDGE_SCALE_Y, Math.min(distance * PULL_DISTANCE_EDGE_FACTOR, 1.f)); HELD_EDGE_SCALE_Y, Math.min(distance * PULL_DISTANCE_EDGE_FACTOR, 1.f));
mGlowAlpha = mGlowAlphaStart = Math.min( mGlowAlpha = mGlowAlphaStart = Math.min(MAX_ALPHA,
mGlowAlpha + mGlowAlpha +
(Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR), (Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR));
MAX_ALPHA);
float glowChange = Math.abs(deltaDistance); float glowChange = Math.abs(deltaDistance);
if (deltaDistance > 0 && mPullDistance < 0) { if (deltaDistance > 0 && mPullDistance < 0) {
@@ -157,8 +156,10 @@ public class EdgeGlow {
if (mPullDistance == 0) { if (mPullDistance == 0) {
mGlowScaleY = 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; mEdgeAlphaFinish = mEdgeAlpha;
mEdgeScaleYFinish = mEdgeScaleY; mEdgeScaleYFinish = mEdgeScaleY;