diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-06-11 17:35:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 22:12:51 +0000 |
| commit | ada8d7dfe1a52eab1e2a0954cf369ed6d198de94 (patch) | |
| tree | 4eb069a0008261ae21479df3900e5b8e97111388 /src/com | |
| parent | a629f26824c1f1b82cd6ecb5eb88df56eab6cdfe (diff) | |
| parent | 8edd2001417443c34a930be79b8ee8438dcff246 (diff) | |
| download | android_packages_apps_Trebuchet-ada8d7dfe1a52eab1e2a0954cf369ed6d198de94.tar.gz android_packages_apps_Trebuchet-ada8d7dfe1a52eab1e2a0954cf369ed6d198de94.tar.bz2 android_packages_apps_Trebuchet-ada8d7dfe1a52eab1e2a0954cf369ed6d198de94.zip | |
Merge "Make folder stack more vertical for LMP preview" into ub-now-nova
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 4a701d558..be6cf4857 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -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 { |