commit 619880f436c3b676a90c853266d49e505fa90f5e
author Sunny Goyal <sunnygoyal@google.com> Wed Jan 04 00:33:45 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 00:33:45 2017 +0000
tree 762c377ea9138025149d21147e7fa5f347ab1047
parent 9f33cb2ce23a8474a707ddd6ccc86f9f1aa6a397
parent 3fe4a146cf774261ab3552dd8ab392439c771e54

Merge "Simplifying IconCache access code" into ub-launcher3-master

src/com/android/launcher3/AppWidgetResizeFrame.java

diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index 90dcc80..f879216 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -518,10 +518,10 @@
         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) {