summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-09-12 00:05:02 +0200
committerMichael Jurka <mikejurka@google.com>2013-09-13 18:16:54 +0200
commitadc574ccb1986856b38198ad5a934b7543a1debb (patch)
treee0ad8ad86b1abe482a2c5820e7f4a3dacf0e5de8 /src/com/android/launcher3/Workspace.java
parent80521d95f96f6eb630c269f899ecc28b809fb5ba (diff)
downloadandroid_packages_apps_Trebuchet-adc574ccb1986856b38198ad5a934b7543a1debb.tar.gz
android_packages_apps_Trebuchet-adc574ccb1986856b38198ad5a934b7543a1debb.tar.bz2
android_packages_apps_Trebuchet-adc574ccb1986856b38198ad5a934b7543a1debb.zip
Update to using new crop intent
Also, unify WallpaperCropActivity so it's identical to the system default version (mainly removing Launcher dependencies) Change-Id: I1ebc390bce23de62d76daced6f8cb44d57e4ac0c
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 3f63d743a..9f4fa8a50 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;
@@ -977,8 +978,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);
}