Workspace: Don't set wallpaper visibility with hack

Change-Id: Ib3c21db1535a0a3c8f41a9cddfa21ade0ecebe84

2 files changed, 1 insertions, 11 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 0de1063..9170f4c 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -311,8 +311,6 @@ public final class Launcher extends Activity
     private boolean mHideIconLabels;
     private boolean mAutoRotate;
 
-    private boolean mWallpaperVisible;
-
     private Runnable mBuildLayersRunnable = new Runnable() {
         public void run() {
             if (mWorkspace != null) {
@@ -2475,13 +2473,8 @@ public final class Launcher extends Activity
         }
     }
 
-    void setWallpaperVisibility(boolean visible) {
-        mWallpaperVisible = visible;
-        updateWallpaperVisibility(visible);
-    }
-
     void updateWallpaperVisibility(boolean visible) {
-        int wpflags = visible && mWallpaperVisible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0;
+        int wpflags = visible ? WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER : 0;
         int curflags = getWindow().getAttributes().flags
                 & WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
         if (wpflags != curflags) {
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 15a620c..8de0e21 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -528,7 +528,6 @@ public class Workspace extends SmoothPagedView
                 }
             }
         }
-        mLauncher.setWallpaperVisibility(mWallpaperBitmap == null);
 
         // Make sure wallpaper gets redrawn to avoid ghost wallpapers
         invalidate();
@@ -918,10 +917,8 @@ public class Workspace extends SmoothPagedView
 
         // Update wallpaper offsets to match hack (for recent apps window)
         if (mWallpaperHack && mWallpaperBitmap != null) {
-            mLauncher.setWallpaperVisibility(true);
             mWallpaperManager.setWallpaperOffsetSteps(1.0f / (getChildCount() - 1), 1.0f);
             mWallpaperManager.setWallpaperOffsets(mWindowToken, mWallpaperScroll, 0);
-            mLauncher.setWallpaperVisibility(false);
         }
     }