diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-01-03 09:30:00 -0800 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-01-03 09:38:11 -0800 |
commit | 9f33cb2ce23a8474a707ddd6ccc86f9f1aa6a397 (patch) | |
tree | b6074c10af5e5391b5669d745cc5e6bc59a5e90b /src | |
parent | bf8a265deb093e147a5289e0958cc9b1bc50a6e3 (diff) | |
download | android_packages_apps_Trebuchet-9f33cb2ce23a8474a707ddd6ccc86f9f1aa6a397.tar.gz android_packages_apps_Trebuchet-9f33cb2ce23a8474a707ddd6ccc86f9f1aa6a397.tar.bz2 android_packages_apps_Trebuchet-9f33cb2ce23a8474a707ddd6ccc86f9f1aa6a397.zip |
Bind the out IntRange using its start and end values.
In applyDeltaAndBound, we add the current IntRange values
+ delta param to the outbound IntRange -- but then we only
bind based on the current IntRange values, so the out IntRange
values can end be out of bounds.
Change-Id: Ibbaae8c2c2734107d1fd7ce8a59a4c66d83068ad
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/AppWidgetResizeFrame.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 90dcc80de..f8792163c 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -518,10 +518,10 @@ public class AppWidgetResizeFrame extends FrameLayout public int applyDeltaAndBound(boolean moveStart, boolean moveEnd, int delta, int minSize, int maxEnd, IntRange out) { applyDelta(moveStart, moveEnd, delta, out); - if (start < 0) { + if (out.start < 0) { out.start = 0; } - if (end > maxEnd) { + if (out.end > maxEnd) { out.end = maxEnd; } if (out.size() < minSize) { |