diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-05-08 18:08:38 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-05-09 08:02:50 -0700 |
| commit | d5fc4f309f650790f08748eb79b2e160e9f1c336 (patch) | |
| tree | afc7f7f441d93876f2e5c1fad0a4d97fb0fb00d2 /src | |
| parent | b73fa5d7a46e840df13b2d5fb8ae956344524c3e (diff) | |
| download | android_packages_apps_Trebuchet-d5fc4f309f650790f08748eb79b2e160e9f1c336.tar.gz android_packages_apps_Trebuchet-d5fc4f309f650790f08748eb79b2e160e9f1c336.tar.bz2 android_packages_apps_Trebuchet-d5fc4f309f650790f08748eb79b2e160e9f1c336.zip | |
Fix folder animation in RTL mode.
Bug: 37905379
Change-Id: I3d837753b8fd4bcd2e2c59f1aa7c62457f037de3
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/folder/FolderAnimationManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 578921f64..bee0bd418 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -139,6 +139,7 @@ public class FolderAnimationManager { 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 @@ public class FolderAnimationManager { // 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 @@ public class FolderAnimationManager { : 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), |