diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-22 00:30:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 00:30:09 +0000 |
commit | 4c041dea2172ecabc06b009dd05076765aa36d5e (patch) | |
tree | 724150c9dc81f76d831513fdf68a132d8c9f0f79 /src/com | |
parent | c2cf4d1cdd06f98288eb2f53d0c06477ce17606d (diff) | |
parent | ea90f83e248086b91dbbc7969059f6887190b2a2 (diff) | |
download | android_packages_apps_Trebuchet-4c041dea2172ecabc06b009dd05076765aa36d5e.tar.gz android_packages_apps_Trebuchet-4c041dea2172ecabc06b009dd05076765aa36d5e.tar.bz2 android_packages_apps_Trebuchet-4c041dea2172ecabc06b009dd05076765aa36d5e.zip |
am ea90f83e: Check before suggesting default wallpaper dimensions
* commit 'ea90f83e248086b91dbbc7969059f6887190b2a2':
Check before suggesting default wallpaper dimensions
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 9da1fbb42..0044d7ae6 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4481,6 +4481,14 @@ public class Launcher extends Activity } } + /** + * 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() { + return true; + } + protected boolean shouldClingFocusHotseatApp() { return false; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index b76beda27..001541825 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1276,7 +1276,8 @@ public class Workspace extends SmoothPagedView SharedPreferences sp = mLauncher.getSharedPreferences(spKey, Context.MODE_MULTI_PROCESS); LauncherWallpaperPickerActivity.suggestWallpaperDimension(mLauncher.getResources(), - sp, mLauncher.getWindowManager(), mWallpaperManager); + sp, mLauncher.getWindowManager(), mWallpaperManager, + mLauncher.overrideWallpaperDimensions()); return null; } }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null); |