diff options
author | Adam Cohen <adamcohen@google.com> | 2012-06-08 11:52:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-08 11:52:42 -0700 |
commit | 001a17fcf5b825801bc9987cebab9411ce329f9d (patch) | |
tree | d6f8225807e7215dd5ab17fe23253574ddd96712 /src/com/android/launcher2/Folder.java | |
parent | e44a47881e2849fa2d4e0f45e5cf6aa1595c0e8d (diff) | |
parent | ec3f3b92f0d3e545f1921b6111a34541000f416c (diff) | |
download | android_packages_apps_Trebuchet-001a17fcf5b825801bc9987cebab9411ce329f9d.tar.gz android_packages_apps_Trebuchet-001a17fcf5b825801bc9987cebab9411ce329f9d.tar.bz2 android_packages_apps_Trebuchet-001a17fcf5b825801bc9987cebab9411ce329f9d.zip |
am ec3f3b92: Merge "Fix two pieces of folder jank" into jb-dev
* commit 'ec3f3b92f0d3e545f1921b6111a34541000f416c':
Fix two pieces of folder jank
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
-rw-r--r-- | src/com/android/launcher2/Folder.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index db65a31ee..1163f9ec4 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -100,6 +100,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private boolean mSuppressFolderDeletion = false; private boolean mItemAddedBackToSelfViaIcon = false; FolderEditText mFolderName; + private float mFolderIconPivotX; + private float mFolderIconPivotY; private boolean mIsEditingName = false; private InputMethodManager mInputMethodManager; @@ -839,20 +841,24 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList int folderPivotY = height / 2 + (centeredTop - top); setPivotX(folderPivotX); setPivotY(folderPivotY); - int folderIconPivotX = (int) (mFolderIcon.getMeasuredWidth() * + mFolderIconPivotX = (int) (mFolderIcon.getMeasuredWidth() * (1.0f * folderPivotX / width)); - int folderIconPivotY = (int) (mFolderIcon.getMeasuredHeight() * + mFolderIconPivotY = (int) (mFolderIcon.getMeasuredHeight() * (1.0f * folderPivotY / height)); - mFolderIcon.setPivotX(folderIconPivotX); - mFolderIcon.setPivotY(folderIconPivotY); - lp.width = width; lp.height = height; lp.x = left; lp.y = top; } + float getPivotXForIconAnimation() { + return mFolderIconPivotX; + } + float getPivotYForIconAnimation() { + return mFolderIconPivotY; + } + private void setupContentForNumItems(int count) { setupContentDimensions(count); |