diff options
| author | Martin Brabham <optedoblivion@cyngn.com> | 2015-09-16 13:54:05 -0700 |
|---|---|---|
| committer | Ed Mancebo <emancebo@cyngn.com> | 2015-09-21 13:52:36 -0700 |
| commit | bbd12132cb567e06dfbe8639ad66f9ffeec3e54d (patch) | |
| tree | 59583ed6e893e8cca596218558941bf6d466a828 | |
| parent | 6eeb4d27f1c64109f3d929ff87eba6f0b92b3ead (diff) | |
| download | android_packages_apps_Trebuchet-bbd12132cb567e06dfbe8639ad66f9ffeec3e54d.tar.gz android_packages_apps_Trebuchet-bbd12132cb567e06dfbe8639ad66f9ffeec3e54d.tar.bz2 android_packages_apps_Trebuchet-bbd12132cb567e06dfbe8639ad66f9ffeec3e54d.zip | |
Ensure spans do not fall below minimum spans.
Change-Id: I2a8546d17f8446000a75bb568c842dbae74f7e4e
Ticket-Id: HAM-389
(cherry picked from commit e13df0dd3a2e0efe70c7e0bdbd3464f5abab8921)
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index f67d6d86d..7696bf6fb 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2976,6 +2976,9 @@ public class LauncherModel extends BroadcastReceiver N = appWidgets.size(); for (int i = 0; i < N; i++) { final LauncherAppWidgetInfo widget = appWidgets.get(i); + // Need to ensure the spans are sane (e.g. not below min spans) + widget.spanX = Math.max(widget.spanX, widget.minSpanX); + widget.spanY = Math.max(widget.spanY, widget.minSpanY); final Runnable r = new Runnable() { public void run() { Callbacks callbacks = tryGetCallbacks(oldCallbacks); |