diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-13 16:25:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 16:25:59 -0700 |
| commit | 7d73b7066867368ebb30dd67a1649ae9db04b93e (patch) | |
| tree | be72b498ecc4da668a65b0b03685480cf63696c8 /core/java/android/widget | |
| parent | 5bfa3a34eaef759c3ec4def76f646eb1c0bf997f (diff) | |
| parent | 868322ced806ec58750edd8ce964f4e17507ddad (diff) | |
am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread
Merge commit '868322ced806ec58750edd8ce964f4e17507ddad' into gingerbread-plus-aosp
* commit '868322ced806ec58750edd8ce964f4e17507ddad':
Reduce the time it takes to decay the glow after a pull.
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/EdgeGlow.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/EdgeGlow.java b/core/java/android/widget/EdgeGlow.java index c1a389ae1360..416be86e5915 100644 --- a/core/java/android/widget/EdgeGlow.java +++ b/core/java/android/widget/EdgeGlow.java @@ -33,10 +33,10 @@ public class EdgeGlow { private static final int RECEDE_TIME = 1000; // Time it will take before a pulled glow begins receding - private static final int PULL_TIME = 250; + private static final int PULL_TIME = 167; // Time it will take for a pulled glow to decay to partial strength before release - private static final int PULL_DECAY_TIME = 10000; + private static final int PULL_DECAY_TIME = 1000; private static final float MAX_ALPHA = 0.8f; private static final float HELD_EDGE_ALPHA = 0.7f; |