PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

am ada8d7df: Merge "Make folder stack more vertical for LMP preview" into ub-now-nova

Browse Source 
* commit 'ada8d7dfe1a52eab1e2a0954cf369ed6d198de94':
  Make folder stack more vertical for LMP preview
This commit is contained in:
Adam Cohen
2014-06-11 17:37:53 +00:00
committed by Android Git Automerger
parent 2854d54b94 ada8d7dfe1
commit 74ba0c31a8
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/FolderIcon.java
+12
View File
@@ -73,6 +73,8 @@ public class FolderIcon extends FrameLayout implements FolderListener {
// The amount of vertical spread between items in the stack [0...1]
private static final float PERSPECTIVE_SHIFT_FACTOR = 0.24f;
private static final float PERSPECTIVE_SHIFT_FACTOR_L = 0.18f;
// Flag as to whether or not to draw an outer ring. Currently none is designed.
public static final boolean HAS_OUTER_RING = true;
@@ -501,10 +503,16 @@ public class FolderIcon extends FrameLayout implements FolderListener {
int adjustedAvailableSpace = (int) ((mAvailableSpaceInPreview / 2) * (1 + 0.8f));
int unscaledHeight = (int) (mIntrinsicIconSize * (1 + PERSPECTIVE_SHIFT_FACTOR));
if (Utilities.isLmp()) {
unscaledHeight = (int) (mIntrinsicIconSize * (1 + PERSPECTIVE_SHIFT_FACTOR_L));
}
mBaselineIconScale = (1.0f * adjustedAvailableSpace / unscaledHeight);
mBaselineIconSize = (int) (mIntrinsicIconSize * mBaselineIconScale);
mMaxPerspectiveShift = mBaselineIconSize * PERSPECTIVE_SHIFT_FACTOR;
if (Utilities.isLmp()) {
mMaxPerspectiveShift = mBaselineIconSize * PERSPECTIVE_SHIFT_FACTOR_L;
}
mPreviewOffsetX = (mTotalWidth - mAvailableSpaceInPreview) / 2;
mPreviewOffsetY = previewPadding + grid.folderBackgroundOffset;
@@ -559,6 +567,10 @@ public class FolderIcon extends FrameLayout implements FolderListener {
float totalScale = mBaselineIconScale * scale;
final int overlayAlpha = (int) (80 * (1 - r));
if (Utilities.isLmp()) {
transX = (mAvailableSpaceInPreview - scaledSize) / 2;
}
if (params == null) {
params = new PreviewItemDrawingParams(transX, transY, totalScale, overlayAlpha);
} else {