diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-11 22:08:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-11 22:08:05 +0000 |
| commit | e759e4de5fb05081cc532deef93457866d85de8b (patch) | |
| tree | e9f08ac1e6518ad648d3a5b698d90c0e78bd077d /src | |
| parent | 6d45594971bf125500018c36eb3c40a665acff81 (diff) | |
| parent | 5abb9f88efc42ce7c5b34f21944bc119ecb57cec (diff) | |
| download | android_packages_apps_Trebuchet-e759e4de5fb05081cc532deef93457866d85de8b.tar.gz android_packages_apps_Trebuchet-e759e4de5fb05081cc532deef93457866d85de8b.tar.bz2 android_packages_apps_Trebuchet-e759e4de5fb05081cc532deef93457866d85de8b.zip | |
Merge "Separating out Launcher3 resources from Wallpaper resources" into ub-launcher3-calgary
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/util/WallpaperUtils.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d9217e824..414ebb4b1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -113,6 +113,7 @@ import com.android.launcher3.util.LongArrayMap; import com.android.launcher3.util.TestingUtils; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.ViewOnDrawExecutor; +import com.android.launcher3.util.WallpaperUtils; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.WidgetHostViewLoader; import com.android.launcher3.widget.WidgetsContainerView; @@ -2767,7 +2768,7 @@ public class Launcher extends Activity int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen()); float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll); startActivityForResult(new Intent(Intent.ACTION_SET_WALLPAPER).setPackage(getPackageName()) - .putExtra(WallpaperPickerActivity.EXTRA_WALLPAPER_OFFSET, offset), + .putExtra(WallpaperUtils.EXTRA_WALLPAPER_OFFSET, offset), REQUEST_PICK_WALLPAPER); if (mLauncherCallbacks != null) { diff --git a/src/com/android/launcher3/util/WallpaperUtils.java b/src/com/android/launcher3/util/WallpaperUtils.java index a5251e190..45c83bd8c 100644 --- a/src/com/android/launcher3/util/WallpaperUtils.java +++ b/src/com/android/launcher3/util/WallpaperUtils.java @@ -38,6 +38,8 @@ public final class WallpaperUtils { public static final String WALLPAPER_HEIGHT_KEY = "wallpaper.height"; public static final float WALLPAPER_SCREENS_SPAN = 2f; + public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET"; + public static void saveWallpaperDimensions(int width, int height, Activity activity) { if (Utilities.ATLEAST_KITKAT) { // From Kitkat onwards, ImageWallpaper does not care about the |