diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2017-07-26 17:41:02 +0000 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-07-26 11:05:29 -0700 |
| commit | 9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b (patch) | |
| tree | 9586edea8f1a0704212e56baa0bb3b6765265052 /src/com/android/launcher3/DeviceProfile.java | |
| parent | df4aaca594953e940dffdc873e96b31fb2bb6474 (diff) | |
| download | android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.tar.gz android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.tar.bz2 android_packages_apps_Trebuchet-9ad87463a8e62cb620c4a738ed9f534b9e9dfb9b.zip | |
Revert "Update Folders to match spec."
This reverts commit fd8fa136f5cec15302bf48bdd60761e057f960c4.
Change-Id: Ifb8ce81e23f38df2eb2c26f93376eca19caae5b1
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 10 |
1 files changed, 3 insertions, 7 deletions
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) { |