diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-05-21 23:00:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 23:00:02 +0000 |
| commit | 00a019d9e5713a595e6528d985174e4dff454445 (patch) | |
| tree | 5125f5536f0dad9fbd7c691e0b49a3e0b80a5a2c /src/com | |
| parent | e1cdf5253d8c61218fe3b308803408c04f71ffa3 (diff) | |
| parent | f8dc557cf84ad90186e94d1ebe15f850a6edf2a0 (diff) | |
| download | android_packages_apps_Trebuchet-00a019d9e5713a595e6528d985174e4dff454445.tar.gz android_packages_apps_Trebuchet-00a019d9e5713a595e6528d985174e4dff454445.tar.bz2 android_packages_apps_Trebuchet-00a019d9e5713a595e6528d985174e4dff454445.zip | |
Merge "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, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 76268e8a5..0bd3f210d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2443,11 +2443,15 @@ 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 b76beda27..76f0bd71f 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; } - protected void setWallpaperDimension() { + public 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 |