summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-05-21 15:49:31 -0700
committerAdam Cohen <adamcohen@google.com>2014-05-21 15:53:11 -0700
commitf8dc557cf84ad90186e94d1ebe15f850a6edf2a0 (patch)
treef5607387006ad808be1b489cd5a401be380f87d1 /src
parent7716b400654bae009188daf9053b68727410a53d (diff)
downloadandroid_packages_apps_Trebuchet-f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.tar.gz
android_packages_apps_Trebuchet-f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.tar.bz2
android_packages_apps_Trebuchet-f8dc557cf84ad90186e94d1ebe15f850a6edf2a0.zip
Debugging wallpaper stuff on production device (to be reverted once built)
issue 14470153 Change-Id: I6c93b11f639d79163da0c3ce4e4053e304e0081e
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java4
-rw-r--r--src/com/android/launcher3/Workspace.java6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9da1fbb42..b02c3c69a 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2490,11 +2490,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