diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-09 15:12:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-09 15:12:18 +0000 |
| commit | 85d857376422b595284d002e3abc0b2095ad38c5 (patch) | |
| tree | c9816e5a566d25c9a6e0c2ae9b33f33d1ef469d0 /src | |
| parent | fd60f7274debf020953ac57db93103a38b08173a (diff) | |
| parent | d5fc4f309f650790f08748eb79b2e160e9f1c336 (diff) | |
| download | android_packages_apps_Trebuchet-85d857376422b595284d002e3abc0b2095ad38c5.tar.gz android_packages_apps_Trebuchet-85d857376422b595284d002e3abc0b2095ad38c5.tar.bz2 android_packages_apps_Trebuchet-85d857376422b595284d002e3abc0b2095ad38c5.zip | |
Merge "Fix folder animation in RTL mode." into ub-launcher3-dorval-polish
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), |