diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-21 15:03:34 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-05-21 17:13:40 -0700 |
commit | ea90f83e248086b91dbbc7969059f6887190b2a2 (patch) | |
tree | 09c219e33ea8b995857ecf5c985bdfda602072e1 /src/com | |
parent | 73859adf80c94a377508a1d9ea8b6fa45a19f80f (diff) | |
download | android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.tar.gz android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.tar.bz2 android_packages_apps_Trebuchet-ea90f83e248086b91dbbc7969059f6887190b2a2.zip |
Check before suggesting default wallpaper dimensions
issue 14470153
Change-Id: Id00e9cb4bd2b769818ed61de65be8c1c0119e07d
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 76268e8a5..e154e57e0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4434,6 +4434,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); |