diff options
author | Adam Cohen <adamcohen@google.com> | 2016-03-21 13:40:02 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2016-03-21 14:08:54 -0700 |
commit | aa2542a461072a57058ce45946ff6f5552ecce8a (patch) | |
tree | 0e669cd58a9b9634b0c76256303f0eef31106339 | |
parent | 470f900fce017dc015851bfe3e591be5feedf6cc (diff) | |
download | android_packages_apps_Trebuchet-aa2542a461072a57058ce45946ff6f5552ecce8a.tar.gz android_packages_apps_Trebuchet-aa2542a461072a57058ce45946ff6f5552ecce8a.tar.bz2 android_packages_apps_Trebuchet-aa2542a461072a57058ce45946ff6f5552ecce8a.zip |
Invalidate folder drawing paramaters when top padding changes
-> This fixes issues when moving folders between the workspace
and hotseat (which have different top paddings)
Change-Id: Iac5a4575a403ce8eadd1d3195f02ab10fe5dac23
-rw-r--r-- | src/com/android/launcher3/folder/FolderIcon.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 62007f072..a9b707fcf 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -105,8 +105,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { // These variables are all associated with the drawing of the preview; they are stored // as member variables for shared usage and to avoid computation on each frame - private int mIntrinsicIconSize; - private int mTotalWidth; + private int mIntrinsicIconSize = -1; + private int mTotalWidth = -1; + private int mPrevTopPadding = -1; + PreviewBackground mBackground = new PreviewBackground(); private PreviewLayoutRule mPreviewLayoutRule; @@ -376,11 +378,13 @@ public class FolderIcon extends FrameLayout implements FolderListener { } private void computePreviewDrawingParams(int drawableSize, int totalSize) { - if (mIntrinsicIconSize != drawableSize || mTotalWidth != totalSize) { + if (mIntrinsicIconSize != drawableSize || mTotalWidth != totalSize || + mPrevTopPadding != getPaddingTop()) { DeviceProfile grid = mLauncher.getDeviceProfile(); mIntrinsicIconSize = drawableSize; mTotalWidth = totalSize; + mPrevTopPadding = getPaddingTop(); mBackground.setup(getResources().getDisplayMetrics(), grid, this, mTotalWidth, getPaddingTop()); |