summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-09 21:05:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-09 21:05:23 +0000
commit16d90e3be590d0232e87ef1694356876c2da320d (patch)
tree057d7029a9451018ace2cfbc8bd763dbaf08a90e /src
parent238ec0b2e2073b61a1003ad393f33d2ff905fe48 (diff)
parent5044c35b07f07f9bd0b26f44bc71b7bc8057b37f (diff)
downloadandroid_packages_apps_Trebuchet-16d90e3be590d0232e87ef1694356876c2da320d.tar.gz
android_packages_apps_Trebuchet-16d90e3be590d0232e87ef1694356876c2da320d.tar.bz2
android_packages_apps_Trebuchet-16d90e3be590d0232e87ef1694356876c2da320d.zip
Merge "Update hotseat cell height calculation." into ub-launcher3-dorval-polish2
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 60c19bc5d..150bc5309 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -365,7 +365,7 @@ public class DeviceProfile {
if (isVerticalBarLayout()) {
hotseatBarSizePx = iconSizePx;
}
- hotseatCellHeightPx = iconSizePx + iconDrawablePaddingPx;
+ hotseatCellHeightPx = iconSizePx;
if (!isVerticalBarLayout()) {
int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx