summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2009-12-10 16:08:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-10 16:08:33 -0800
commit34e5c901edef1c8bc5a25502f56dc7d78eaaf7e3 (patch)
tree34d7450db489c0b1acbe567e3b230f2f7d257725
parente09f8cb3d9ee35506308074ef3e040153ec9fb64 (diff)
parentf974e91d19c78937f9a196fa818e51ffd8838ff3 (diff)
downloadandroid_packages_wallpapers_MagicSmoke-34e5c901edef1c8bc5a25502f56dc7d78eaaf7e3.tar.gz
android_packages_wallpapers_MagicSmoke-34e5c901edef1c8bc5a25502f56dc7d78eaaf7e3.tar.bz2
android_packages_wallpapers_MagicSmoke-34e5c901edef1c8bc5a25502f56dc7d78eaaf7e3.zip
am f974e91d: Fix the magic smoke wallpaper so it doesn\'t jump after turning the screen on.
Merge commit 'f974e91d19c78937f9a196fa818e51ffd8838ff3' * commit 'f974e91d19c78937f9a196fa818e51ffd8838ff3': Fix the magic smoke wallpaper so it doesn't jump after turning the screen on.
-rw-r--r--res/raw/clouds.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/res/raw/clouds.rs b/res/raw/clouds.rs
index 1c02c03..919d853 100644
--- a/res/raw/clouds.rs
+++ b/res/raw/clouds.rs
@@ -288,9 +288,10 @@ int main(int launchID) {
int now = uptimeMillis();
timedelta = ((float)(now - lastuptime)) / 44.f;
lastuptime = now;
- if (timedelta > 100) {
- // If we didn't render anything for several seconds, just pretend time stopped.
- timedelta = 1;
+ if (timedelta > 3) {
+ // Limit the step adjustment factor to 3, so we don't get a sudden jump
+ // after coming back from sleep.
+ timedelta = 3;
}
i = State->mPreset;