diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-21 23:01:25 +0000 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-05-21 23:01:25 +0000 |
commit | 824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5 (patch) | |
tree | 6c88cc2291d7620339b48f505dbee49fb79fe4f1 /src | |
parent | f8dc557cf84ad90186e94d1ebe15f850a6edf2a0 (diff) | |
download | android_packages_apps_Trebuchet-824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5.tar.gz android_packages_apps_Trebuchet-824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5.tar.bz2 android_packages_apps_Trebuchet-824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5.zip |
Revert "Debugging wallpaper stuff on production device (to be reverted once built)"
This reverts commit f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.
Change-Id: I2a2ce9a067ec6df829eb23997661bb090daa64ff
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 | ||||
-rw-r--r-- | 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 b02c3c69a..9da1fbb42 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 76f0bd71f..b76beda27 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 |