diff options
author | Michael Jurka <mikejurka@google.com> | 2011-03-09 15:53:51 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 15:53:51 -0800 |
commit | 809cc36188c6acbf535820f8765cc9673e49b04c (patch) | |
tree | c7b525fdc19ef0e9492813141e587b85e8096e02 | |
parent | 9496cf9d9e030bb04180afa031e9661650b218c8 (diff) | |
parent | 72a174de20d06c8592b4de5bda4b13a96d05be7a (diff) | |
download | android_packages_apps_Trebuchet-809cc36188c6acbf535820f8765cc9673e49b04c.tar.gz android_packages_apps_Trebuchet-809cc36188c6acbf535820f8765cc9673e49b04c.tar.bz2 android_packages_apps_Trebuchet-809cc36188c6acbf535820f8765cc9673e49b04c.zip |
am 72a174de: Merge "Fix wonky background rendering in spring loaded mode" into honeycomb-mr1
* commit '72a174de20d06c8592b4de5bda4b13a96d05be7a':
Fix wonky background rendering in spring loaded mode
-rw-r--r-- | src/com/android/launcher2/AllAppsTabbed.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher2/AllAppsTabbed.java b/src/com/android/launcher2/AllAppsTabbed.java index aa828b049..0dd56acff 100644 --- a/src/com/android/launcher2/AllAppsTabbed.java +++ b/src/com/android/launcher2/AllAppsTabbed.java @@ -177,8 +177,11 @@ public class AllAppsTabbed extends TabHost implements AllAppsView, LauncherTrans // Turn on hardware layers for performance setLayerType(LAYER_TYPE_HARDWARE, null); // Re-enable the rendering of the dimmed background in All Apps for performance reasons - mLauncher.getWorkspace().disableBackground(); - mBackground.setVisibility(VISIBLE); + // if we're fading it in + if (mLauncher.getWorkspace().getBackgroundAlpha() == 0f) { + mLauncher.getWorkspace().disableBackground(); + mBackground.setVisibility(VISIBLE); + } // just a sanity check that we don't build a layer before a call to onLayout if (!mFirstLayout) { // force building the layer at the beginning of the animation, so you don't get a @@ -199,8 +202,10 @@ public class AllAppsTabbed extends TabHost implements AllAppsView, LauncherTrans } // Move the rendering of the dimmed background to workspace after the all apps animation // is done, so that the background is not rendered *above* the mini workspace screens - mLauncher.getWorkspace().enableBackground(); - mBackground.setVisibility(GONE); + if (mBackground.getVisibility() != GONE) { + mLauncher.getWorkspace().enableBackground(); + mBackground.setVisibility(GONE); + } mAllApps.allowHardwareLayerCreation(); } |