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

merge from open-source master

Browse Source
This commit is contained in:
The Android Open Source Project
2010-02-05 13:55:16 -08:00
parent 0af0449301 7d039fbe07
commit ad9bcb22d0
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/animation/Animation.java
View File

@@ -880,7 +880,7 @@ public abstract class Animation implements Cloneable {
region.inset(-1.0f, -1.0f);
if (mFillBefore) {
final Transformation previousTransformation = mPreviousTransformation;
applyTransformation(0.0f, previousTransformation);
applyTransformation(mInterpolator.getInterpolation(0.0f), previousTransformation);
}
}

4
core/java/android/view/animation/AnimationSet.java
View File

@@ -282,7 +282,9 @@ public class AnimationSet extends Animation {
final Animation a = animations.get(i);
temp.clear();
a.applyTransformation(0.0f, temp);
final Interpolator interpolator = a.mInterpolator;
a.applyTransformation(interpolator != null ? interpolator.getInterpolation(0.0f)
: 0.0f, temp);
previousTransformation.compose(temp);
}
}

2
location/java/com/android/internal/location/GpsLocationProvider.java
View File

@@ -890,6 +890,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
switch (status) {
case GPS_STATUS_SESSION_BEGIN:
mNavigating = true;
mEngineOn = true;
break;
case GPS_STATUS_SESSION_END:
mNavigating = false;
@@ -899,6 +900,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
break;
case GPS_STATUS_ENGINE_OFF:
mEngineOn = false;
mNavigating = false;
break;
}

4
test-runner/android/test/TouchUtils.java
View File

@@ -773,7 +773,7 @@ public class TouchUtils {
float xStep = (toX - fromX) / stepCount;
MotionEvent event = MotionEvent.obtain(downTime, eventTime,
MotionEvent.ACTION_DOWN, fromX, y, 0);
MotionEvent.ACTION_DOWN, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
@@ -787,7 +787,7 @@ public class TouchUtils {
}
eventTime = SystemClock.uptimeMillis();
event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, fromX, y, 0);
event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
inst.sendPointerSync(event);
inst.waitForIdleSync();
}