Removing dependency on wallpaper size settings from launcher
> Moving wallpaper desired width calculation to xml
Bug: 14470153
Change-Id: I8803af158861507a40e5d55e9aa6d515be47eefa
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 245b399..5939878 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -120,7 +120,6 @@
import com.android.launcher3.widget.PendingAddWidgetInfo;
import com.android.launcher3.widget.WidgetHostViewLoader;
import com.android.launcher3.widget.WidgetsContainerView;
-import com.android.wallpaperpicker.WallpaperUtils;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -2750,7 +2749,7 @@
int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen());
float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll);
startActivityForResult(new Intent(Intent.ACTION_SET_WALLPAPER).setPackage(getPackageName())
- .putExtra(WallpaperUtils.EXTRA_WALLPAPER_OFFSET, offset),
+ .putExtra(Utilities.EXTRA_WALLPAPER_OFFSET, offset),
REQUEST_PICK_WALLPAPER);
if (mLauncherCallbacks != null) {
@@ -4502,17 +4501,6 @@
}
/**
- * This method indicates whether or not we should suggest default wallpaper dimensions
- * when our wallpaper cropper was not yet used to set a wallpaper.
- */
- protected boolean overrideWallpaperDimensions() {
- if (mLauncherCallbacks != null) {
- return mLauncherCallbacks.overrideWallpaperDimensions();
- }
- return true;
- }
-
- /**
* To be overridden by subclasses to indicate that there is an activity to launch
* before showing the standard launcher experience.
*/