From 9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b Mon Sep 17 00:00:00 2001 From: Jonathan Miranda Date: Wed, 26 Jul 2017 17:41:02 +0000 Subject: Revert "Update Folders to match spec." This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4. Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1 --- res/layout/folder_application.xml | 7 +------ res/values/dimens.xml | 7 +++---- src/com/android/launcher3/DeviceProfile.java | 10 +++------- src/com/android/launcher3/folder/FolderAnimationManager.java | 9 +++------ 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index 9d4af0d9c..de861a0ad 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -19,9 +19,4 @@ xmlns:launcher="http://schemas.android.com/apk/res-auto" style="@style/BaseIcon" android:includeFontPadding="false" - android:paddingLeft="@dimen/folder_cell_x_padding" - android:paddingTop="@dimen/folder_cell_y_padding" - android:paddingRight="@dimen/folder_cell_x_padding" - android:paddingBottom="@dimen/folder_cell_y_padding" - launcher:centerVertically="true" - launcher:iconDisplay="folder"/> + launcher:iconDisplay="folder" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0eb3982ca..356de7869 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -138,11 +138,10 @@ 10dp 8dp - 8dp - 8dp + 9dp + 6dp 13sp - 8dp - 12dp + 4dp 12dp 14sp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index cb4ad55c7..bd239690f 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -108,7 +108,6 @@ public class DeviceProfile { public int folderChildIconSizePx; public int folderChildTextSizePx; public int folderChildDrawablePaddingPx; - public final int folderChildDrawablePaddingOriginalPx; // Hotseat public int hotseatCellHeightPx; @@ -221,9 +220,6 @@ public class DeviceProfile { hotseatLandRightNavBarGutterPx = res.getDimensionPixelSize( R.dimen.dynamic_grid_hotseat_land_right_nav_bar_gutter_width); - folderChildDrawablePaddingOriginalPx = - res.getDimensionPixelSize(R.dimen.folder_child_icon_drawable_padding); - // Determine sizes. widthPx = width; heightPx = height; @@ -403,15 +399,15 @@ public class DeviceProfile { folderChildIconSizePx = (int) (Utilities.pxFromDp(inv.iconSize, dm) * scale); folderChildTextSizePx = (int) (res.getDimensionPixelSize(R.dimen.folder_child_text_size) * scale); - folderChildDrawablePaddingPx = (int) (folderChildDrawablePaddingOriginalPx * scale); int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx); int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale); int cellPaddingY = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_y_padding) * scale); folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX; - folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight - + folderChildDrawablePaddingPx; + folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight; + folderChildDrawablePaddingPx = Math.max(0, + (folderCellHeightPx - folderChildIconSizePx - textHeight) / 3); } public void updateInsets(Rect insets) { diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index d7f5c2b64..69705d594 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -120,7 +120,6 @@ public class FolderAnimationManager { final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) mFolder.getLayoutParams(); FolderIcon.PreviewLayoutRule rule = mFolderIcon.getLayoutRule(); final List itemsInPreview = mFolderIcon.getPreviewItems(); - BubbleTextView btv = itemsInPreview.get(0); // Match position of the FolderIcon final Rect folderIconPos = new Rect(); @@ -132,7 +131,7 @@ public class FolderAnimationManager { // Match size/scale of icons in the preview float previewScale = rule.scaleForItem(0, itemsInPreview.size()); float previewSize = rule.getIconSize() * previewScale; - float initialScale = previewSize / btv.getIconSize() + float initialScale = previewSize / itemsInPreview.get(0).getIconSize() * scaleRelativeToDragLayer; final float finalScale = 1f; float scale = mIsOpening ? initialScale : finalScale; @@ -149,12 +148,10 @@ public class FolderAnimationManager { previewItemOffsetX = (int) (lp.width * initialScale - initialSize - previewItemOffsetX); } - // Note that we do not include btv.getPaddingLeft() in the calculation, since it is - // handled in addPreviewItemAnimators as part of iconOffsetX. final int paddingOffsetX = (int) ((mFolder.getPaddingLeft() + mContent.getPaddingLeft()) * initialScale); - final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop() - + btv.getPaddingTop()) * initialScale); + final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop()) + * initialScale); int initialX = folderIconPos.left + mPreviewBackground.getOffsetX() - paddingOffsetX - previewItemOffsetX; -- cgit v1.2.3