summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-06-08 22:58:35 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-08 22:58:35 (GMT)
commit7e9e5e20f0d03647f7a115e76b921dd08fddde3f (patch)
treefc5603af916a4100ff58dea6eb806dfab83e601a
parentf75a2cf06c67ec376c435ff0c88785de6dd2d822 (diff)
parent5262bb3c4c4cd4fb566a5003154fa97edcde138b (diff)
downloadandroid_packages_apps_Trebuchet-7e9e5e20f0d03647f7a115e76b921dd08fddde3f.zip
android_packages_apps_Trebuchet-7e9e5e20f0d03647f7a115e76b921dd08fddde3f.tar.gz
android_packages_apps_Trebuchet-7e9e5e20f0d03647f7a115e76b921dd08fddde3f.tar.bz2
am 5262bb3c: Merge "Fixing regression in transition after returning to home from another app. (Bug 6629707)" into jb-dev
* commit '5262bb3c4c4cd4fb566a5003154fa97edcde138b': Fixing regression in transition after returning to home from another app. (Bug 6629707)
-rw-r--r--src/com/android/launcher2/Launcher.java18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 63af10a..28dfd65 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1233,17 +1233,6 @@ public final class Launcher extends Activity
// some communication back with the app.
mWorkspace.postDelayed(mBuildLayersRunnable, 500);
- // We had to enable the wallpaper visibility when launching apps from all
- // apps (so that the transitions would be the same as when launching from
- // workspace) so take this time to see if we need to re-disable the
- // wallpaper visibility to ensure performance.
- mWorkspace.post(new Runnable() {
- @Override
- public void run() {
- disableWallpaperIfInAllApps();
- }
- });
-
observer.removeOnPreDrawListener(this);
return true;
}
@@ -2666,7 +2655,12 @@ public final class Launcher extends Activity
updateWallpaperVisibility(true);
} else {
// When launcher has focus again, disable the wallpaper if we are in AllApps
- disableWallpaperIfInAllApps();
+ mWorkspace.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ disableWallpaperIfInAllApps();
+ }
+ }, 500);
}
}