diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-21 23:01:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 23:01:31 +0000 |
commit | 73859adf80c94a377508a1d9ea8b6fa45a19f80f (patch) | |
tree | bdbf5f317a3a628d2111a1509be0b8946edc2556 /src/com | |
parent | 00a019d9e5713a595e6528d985174e4dff454445 (diff) | |
parent | 824fcb3a3e05166d7e1bd9c2cd821aeaebc994c5 (diff) | |
download | android_packages_apps_Trebuchet-73859adf80c94a377508a1d9ea8b6fa45a19f80f.tar.gz android_packages_apps_Trebuchet-73859adf80c94a377508a1d9ea8b6fa45a19f80f.tar.bz2 android_packages_apps_Trebuchet-73859adf80c94a377508a1d9ea8b6fa45a19f80f.zip |
Merge "Revert "Debugging wallpaper stuff on production device (to be reverted once built)"" into ub-now-nova
Diffstat (limited to 'src/com')
-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 0bd3f210d..76268e8a5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2443,15 +2443,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 |