diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-10-02 14:58:52 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-10-03 11:23:05 -0700 |
commit | 846455e1ffdca9bac72b96ba61d2e42cd45cf4ce (patch) | |
tree | 17cc5038139a086ab7126d2b2220f834ff07c26d /src/com/android/launcher3/DeviceProfile.java | |
parent | 0cab65a5b68229205f5cda5063239f4987996903 (diff) | |
download | android_packages_apps_Trebuchet-846455e1ffdca9bac72b96ba61d2e42cd45cf4ce.tar.gz android_packages_apps_Trebuchet-846455e1ffdca9bac72b96ba61d2e42cd45cf4ce.tar.bz2 android_packages_apps_Trebuchet-846455e1ffdca9bac72b96ba61d2e42cd45cf4ce.zip |
Larger icons for L3Go and spacing changes.
There are cases (ie. smaller devices) where the icon label is closer
to the icon below it (rather than its corresponding icon).
To fix this, we ensure that the drawable padding (space between the
icon and its label) is no larger than the vertical padding of the cell.
Bug: 67317867
Change-Id: Ic3729726eebb60b67d658361c4335e724b7d68d7
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index dec0a92a9..69ee03e9e 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -350,9 +350,18 @@ public class DeviceProfile { iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale); iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale); - cellWidthPx = iconSizePx + iconDrawablePaddingPx; cellHeightPx = iconSizePx + iconDrawablePaddingPx + Utilities.calculateTextHeight(iconTextSizePx); + int cellYPadding = (getCellSize().y - cellHeightPx) / 2; + if (iconDrawablePaddingPx > cellYPadding && !isVerticalBarLayout() + && !inMultiWindowMode()) { + // Ensures that the label is closer to its corresponding icon. This is not an issue + // with vertical bar layout or multi-window mode since the issue is handled separately + // with their calls to {@link #adjustToHideWorkspaceLabels}. + cellHeightPx -= (iconDrawablePaddingPx - cellYPadding); + iconDrawablePaddingPx = cellYPadding; + } + cellWidthPx = iconSizePx + iconDrawablePaddingPx; // All apps allAppsIconTextSizePx = iconTextSizePx; @@ -755,11 +764,14 @@ public class DeviceProfile { return new int[] { padding.left - mInsets.left, padding.right + mInsets.left}; } + public boolean inMultiWindowMode() { + return this != inv.landscapeProfile && this != inv.portraitProfile; + } + public boolean shouldIgnoreLongPressToOverview(float touchX) { - boolean inMultiWindowMode = this != inv.landscapeProfile && this != inv.portraitProfile; boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeMarginPx; boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeMarginPx); - return !inMultiWindowMode && (touchedLhsEdge || touchedRhsEdge); + return !inMultiWindowMode() && (touchedLhsEdge || touchedRhsEdge); } private static Context getContext(Context c, int orientation) { |