diff options
author | Adam Cohen <adamcohen@google.com> | 2016-03-21 14:33:02 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2016-03-21 15:12:15 -0700 |
commit | d3cc05a3a8c573986d08ee293a4bb8b4534d06b2 (patch) | |
tree | beb652c1f33b5c3f723a1e732d71ba3231969599 /src/com | |
parent | aa2542a461072a57058ce45946ff6f5552ecce8a (diff) | |
download | android_packages_apps_Trebuchet-d3cc05a3a8c573986d08ee293a4bb8b4534d06b2.tar.gz android_packages_apps_Trebuchet-d3cc05a3a8c573986d08ee293a4bb8b4534d06b2.tar.bz2 android_packages_apps_Trebuchet-d3cc05a3a8c573986d08ee293a4bb8b4534d06b2.zip |
Account for disparity btw folder preview size and drawable size
-> When there is disparity between the cached icon size and the available space
in the preview, the folder preview could appear not as intended (either
overly crammed, or overly spacious)
issue 27701193
Change-Id: I9f97012ba569d1419b1e3f661cd26761b2a36285
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java index 68b756b24..6ee02f9d7 100644 --- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java +++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java @@ -23,6 +23,7 @@ public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule private float mRadius; private float mIconSize; private boolean mIsRtl; + private float mBaselineIconScale; @Override public void init(int availableSpace, int intrinsicIconSize, boolean rtl) { @@ -30,6 +31,7 @@ public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule mRadius = ITEM_RADIUS_SCALE_FACTOR * availableSpace / 2f; mIconSize = intrinsicIconSize; mIsRtl = rtl; + mBaselineIconScale = availableSpace / (intrinsicIconSize * 1f); } @Override @@ -103,13 +105,16 @@ public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule } private float scaleForNumItems(int numItems) { + float scale = 1f; if (numItems <= 2) { - return MAX_SCALE; + scale = MAX_SCALE; } else if (numItems == 3) { - return (MAX_SCALE + MIN_SCALE) / 2; + scale = (MAX_SCALE + MIN_SCALE) / 2; } else { - return MIN_SCALE; + scale = MIN_SCALE; } + + return scale * mBaselineIconScale; } @Override |