commit d5fc4f309f650790f08748eb79b2e160e9f1c336
author Jon Miranda <jonmiranda@google.com> Mon May 08 18:08:38 2017 -0700
committer Jon Miranda <jonmiranda@google.com> Tue May 09 08:02:50 2017 -0700
tree afc7f7f441d93876f2e5c1fad0a4d97fb0fb00d2
parent b73fa5d7a46e840df13b2d5fb8ae956344524c3e

Fix folder animation in RTL mode.

Bug: 37905379
Change-Id: I3d837753b8fd4bcd2e2c59f1aa7c62457f037de3

src/com/android/launcher3/folder/FolderAnimationManager.java

diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index 578921f..bee0bd4 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -139,6 +139,7 @@
         final Rect folderIconPos = new Rect();
         float scaleRelativeToDragLayer = mLauncher.getDragLayer()
                 .getDescendantRectRelativeToSelf(mFolderIcon, folderIconPos);
+        float initialSize = (mFolderIcon.mBackground.getRadius() * 2) * scaleRelativeToDragLayer;
 
         // Match size/scale of icons in the preview
         float previewScale = rule.scaleForItem(0, itemsInPreview.size());
@@ -156,6 +157,9 @@
         // expected path to their final locations. ie. an icon should not move right, if it's final
         // location is to its left. This value is arbitrarily defined.
         int previewItemOffsetX = (int) (previewSize / 2);
+        if (Utilities.isRtl(mContext.getResources())) {
+            previewItemOffsetX = (int) (lp.width * initialScale - initialSize - previewItemOffsetX);
+        }
 
         final int paddingOffsetX = (int) ((mFolder.getPaddingLeft() + mContent.getPaddingLeft())
                 * initialScale);
@@ -186,9 +190,6 @@
                 : finalTextColor);
 
         // Set up the reveal animation that clips the Folder.
-        float initialSize = (mFolderIcon.mBackground.getRadius() * 2
-                + mPreviewBackground.getStrokeWidth()) * scaleRelativeToDragLayer;
-
         int totalOffsetX = paddingOffsetX + previewItemOffsetX;
         Rect startRect = new Rect(
                 Math.round(totalOffsetX / initialScale),