Merge "Revert "Debugging wallpaper stuff on production device (to be reverted... (73859adf) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}
		*/
		}

		/**

+3 −3

Original line number	Diff line number	Diff line
		@@ -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