summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-14 12:26:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-14 12:26:09 +0000
commit78cf9299b9273053aebba0fdc465d91753aae83f (patch)
tree31bf8197e3bc977f8166c11d9050874bc1d01739 /src/com/android/launcher3/Workspace.java
parentaf110e8603b2f372286d9155cbe8955a6a329e2d (diff)
parentadc574ccb1986856b38198ad5a934b7543a1debb (diff)
downloadandroid_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.tar.gz
android_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.tar.bz2
android_packages_apps_Trebuchet-78cf9299b9273053aebba0fdc465d91753aae83f.zip
Merge "Update to using new crop intent" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 672a38717..0d966f42a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -30,6 +30,7 @@ import android.appwidget.AppWidgetProviderInfo;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
@@ -1044,8 +1045,10 @@ public class Workspace extends SmoothPagedView
};
protected void setWallpaperDimension() {
+ String spKey = WallpaperCropActivity.getSharedPreferencesKey();
+ SharedPreferences sp = mLauncher.getSharedPreferences(spKey, Context.MODE_PRIVATE);
WallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(),
- mLauncher.getSharedPrefs(), mLauncher.getWindowManager(), mWallpaperManager);
+ sp, mLauncher.getWindowManager(), mWallpaperManager);
}