diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-12 22:04:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-12 22:04:29 +0000 |
commit | 4e16c2e7b92baf366a1426fb247e98016d650f33 (patch) | |
tree | 8e57433d921a26a088a30e839ee6c8d88bd797ee /src | |
parent | 40d2702db49fb5be84bf6418365a181ee4efd020 (diff) | |
parent | df39ca11d632434115a318120dc0e356918b4a4a (diff) | |
download | android_packages_apps_Trebuchet-4e16c2e7b92baf366a1426fb247e98016d650f33.tar.gz android_packages_apps_Trebuchet-4e16c2e7b92baf366a1426fb247e98016d650f33.tar.bz2 android_packages_apps_Trebuchet-4e16c2e7b92baf366a1426fb247e98016d650f33.zip |
Merge "Removing padding override in multi-window mode" into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index c32f2d550..2d1ebf114 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -231,9 +231,6 @@ public class DeviceProfile { profile.cellHeightPx = profile.iconSizePx + profile.iconDrawablePaddingPx + Utilities.calculateTextHeight(profile.iconTextSizePx); - // The nav bar is black so we add bottom padding to visually center hotseat icons. - profile.hotseatBarBottomPaddingPx = profile.hotseatBarTopPaddingPx; - // We use these scales to measure and layout the widgets using their full invariant profile // sizes and then draw them scaled and centered to fit in their multi-window mode cellspans. float appWidgetScaleX = (float) profile.getCellSize().x / getCellSize().x; |