From 824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Wed, 21 May 2014 23:01:25 +0000
Subject: [PATCH] Revert "Debugging wallpaper stuff on production device (to be
 reverted once built)"

This reverts commit f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.

Change-Id: I2a2ce9a067ec6df829eb23997661bb090daa64ff
---
 src/com/android/launcher3/Launcher.java  | 4 ----
 src/com/android/launcher3/Workspace.java | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b02c3c69a9..9da1fbb426 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2490,15 +2490,11 @@ public class Launcher extends Activity
      */
     protected void onClickAllAppsButton(View v) {
         if (LOGD) Log.d(TAG, "onClickAllAppsButton");
-
-        mWorkspace.setWallpaperDimension();
-        /*
         if (isAllAppsVisible()) {
             showWorkspace(true);
         } else {
             showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
         }
-        */
     }
 
     /**
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 76f0bd71fd..b76beda276 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -460,7 +460,7 @@ public class Workspace extends SmoothPagedView
         mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
 
         // Set the wallpaper dimensions when Launcher starts up
-        //setWallpaperDimension();
+        setWallpaperDimension();
     }
 
     private void setupLayoutTransition() {
@@ -1269,7 +1269,7 @@ public class Workspace extends SmoothPagedView
         return mCustomContentCallbacks;
     }
 
-    public void setWallpaperDimension() {
+    protected void setWallpaperDimension() {
         new AsyncTask<Void, Void, Void>() {
             public Void doInBackground(Void ... args) {
                 String spKey = WallpaperCropActivity.getSharedPreferencesKey();
@@ -1764,7 +1764,7 @@ public class Workspace extends SmoothPagedView
         // Update wallpaper dimensions if they were changed since last onResume
         // (we also always set the wallpaper dimensions in the constructor)
         if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) {
-            //setWallpaperDimension();
+            setWallpaperDimension();
         }
         mWallpaperIsLiveWallpaper = mWallpaperManager.getWallpaperInfo() != null;
         // Force the wallpaper offset steps to be set again, because another app might have changed