summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/OverScroller.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/widget/OverScroller.java')
-rw-r--r--core/java/android/widget/OverScroller.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
index 4cb1514..778b2dd 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -609,6 +609,7 @@ public class OverScroller {
private boolean mIsPerfLockAcquired = false;
private boolean mIsPerfBoostEnabled = false;
private int fBoostTimeOut = 0;
+ private int flingBoostTimeOut = 0;
private int fBoostParamVal[];
static {
@@ -664,6 +665,10 @@ public class OverScroller {
fBoostParamVal = context.getResources().getIntArray(
com.android.internal.R.array.flingboost_param_value);
}
+
+ if (mPerf == null && mIsPerfBoostEnabled) {
+ mPerf = new BoostFramework();
+ }
}
void updateScroll(float q) {
@@ -786,16 +791,17 @@ public class OverScroller {
if (velocity != 0) {
mDuration = mSplineDuration = getSplineFlingDuration(velocity);
totalDistance = getSplineFlingDistance(velocity);
- if (mPerf == null && mIsPerfBoostEnabled) {
- mPerf = new BoostFramework();
- }
if (mPerf != null) {
mIsPerfLockAcquired = true;
if (0 == fBoostTimeOut) {
- fBoostTimeOut = mDuration;
+ //config value is not defined
+ flingBoostTimeOut = mDuration;
+ } else {
+ //config value is present
+ flingBoostTimeOut = fBoostTimeOut;
}
- mPerf.perfLockAcquire(fBoostTimeOut, fBoostParamVal);
+ mPerf.perfLockAcquire(flingBoostTimeOut, fBoostParamVal);
}
}