Merge "Fixing rebase problem."

2016-10-31 21:20:35 +00:00
parent 423af758c9 34c5c1386c
commit fedb660398
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/policy/PipSnapAlgorithm.java
+++ b/core/java/com/android/internal/policy/PipSnapAlgorithm.java
@@ -70,7 +70,7 @@ public class PipSnapAlgorithm {
            mScroller = new Scroller(mContext);
            mScroller.setFriction(viewConfig.getScrollFriction() * SCROLL_FRICTION_MULTIPLIER);
        }
-        mScroller.fling(sItackBounds.left, stackBounds.top,
+        mScroller.fling(stackBounds.left, stackBounds.top,
                (int) velocityX, (int) velocityY,
                movementBounds.left, movementBounds.right,
                movementBounds.top, movementBounds.bottom);