diff options
| author | Andrew Flynn <flynn@google.com> | 2012-04-26 16:51:20 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-05-02 14:15:00 -0700 |
| commit | 850d2e718560cb12ae73292e9d39f21a93d3c2c1 (patch) | |
| tree | e00dc7846410117d834ac4d09ac2861805a39c3c /src/com/android/launcher2/FolderIcon.java | |
| parent | e3e03bcd313ba8060f2832b6a16dea6fd6d532ea (diff) | |
| download | android_packages_apps_Trebuchet-850d2e718560cb12ae73292e9d39f21a93d3c2c1.tar.gz android_packages_apps_Trebuchet-850d2e718560cb12ae73292e9d39f21a93d3c2c1.tar.bz2 android_packages_apps_Trebuchet-850d2e718560cb12ae73292e9d39f21a93d3c2c1.zip | |
Support split status bar in launcher
Change-Id: I2f6687f52e8326f80e84251e39bf6cd6dc9b2f2b
Diffstat (limited to 'src/com/android/launcher2/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher2/FolderIcon.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java index 4a713293a..d64308406 100644 --- a/src/com/android/launcher2/FolderIcon.java +++ b/src/com/android/launcher2/FolderIcon.java @@ -198,11 +198,13 @@ public class FolderIcon extends LinearLayout implements FolderListener { } mAcceptAnimator = ValueAnimator.ofFloat(0f, 1f); mAcceptAnimator.setDuration(CONSUMPTION_ANIMATION_DURATION); + + final int previewSize = sPreviewSize; mAcceptAnimator.addUpdateListener(new AnimatorUpdateListener() { public void onAnimationUpdate(ValueAnimator animation) { final float percent = (Float) animation.getAnimatedValue(); - mOuterRingSize = (1 + percent * OUTER_RING_GROWTH_FACTOR) * sPreviewSize; - mInnerRingSize = (1 + percent * INNER_RING_GROWTH_FACTOR) * sPreviewSize; + mOuterRingSize = (1 + percent * OUTER_RING_GROWTH_FACTOR) * previewSize; + mInnerRingSize = (1 + percent * INNER_RING_GROWTH_FACTOR) * previewSize; if (mCellLayout != null) { mCellLayout.invalidate(); } @@ -225,11 +227,13 @@ public class FolderIcon extends LinearLayout implements FolderListener { } mNeutralAnimator = ValueAnimator.ofFloat(0f, 1f); mNeutralAnimator.setDuration(CONSUMPTION_ANIMATION_DURATION); + + final int previewSize = sPreviewSize; mNeutralAnimator.addUpdateListener(new AnimatorUpdateListener() { public void onAnimationUpdate(ValueAnimator animation) { final float percent = (Float) animation.getAnimatedValue(); - mOuterRingSize = (1 + (1 - percent) * OUTER_RING_GROWTH_FACTOR) * sPreviewSize; - mInnerRingSize = (1 + (1 - percent) * INNER_RING_GROWTH_FACTOR) * sPreviewSize; + mOuterRingSize = (1 + (1 - percent) * OUTER_RING_GROWTH_FACTOR) * previewSize; + mInnerRingSize = (1 + (1 - percent) * INNER_RING_GROWTH_FACTOR) * previewSize; if (mCellLayout != null) { mCellLayout.invalidate(); } |