commit fedb660398139c295df1291a5f3fafe803b7110c
author Winson Chung <winsonc@google.com> Mon Oct 31 21:20:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 31 21:20:40 2016 +0000
tree 504033332055d8aec2120d83dc37c10ed047e9f6
parent 423af758c91a25ce99cd3387009d53e19b4423a3
parent 34c5c1386c6f6b206631928bf959990f1c7af9a1

Merge "Fixing rebase problem."

core/java/com/android/internal/policy/PipSnapAlgorithm.java

diff --git a/core/java/com/android/internal/policy/PipSnapAlgorithm.java b/core/java/com/android/internal/policy/PipSnapAlgorithm.java
index 1246c27..51804b0 100644
--- a/core/java/com/android/internal/policy/PipSnapAlgorithm.java
+++ b/core/java/com/android/internal/policy/PipSnapAlgorithm.java
@@ -70,7 +70,7 @@
             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);