diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-07-14 11:39:16 -0700 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-07-14 11:39:16 -0700 |
| commit | 52ff3258410fc66a389e3448a487625f4a895117 (patch) | |
| tree | 36a2128d9facf6b17265e519e5d5877f2d99c715 | |
| parent | 28032006970703240f4abd34429608abd2358645 (diff) | |
| download | android_packages_apps_Trebuchet-52ff3258410fc66a389e3448a487625f4a895117.tar.gz android_packages_apps_Trebuchet-52ff3258410fc66a389e3448a487625f4a895117.tar.bz2 android_packages_apps_Trebuchet-52ff3258410fc66a389e3448a487625f4a895117.zip | |
Move padding from Hotseat to Hotseat's CellLayout.
Bug: 63590728
Change-Id: I3ba6ba83b83897d75cc4445a7dab9c5b8b7b8ff1
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 0f4abbe2e..6b76cd62f 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -597,15 +597,18 @@ public class DeviceProfile { ? hotseatBarLeftNavBarRightPaddingPx : hotseatBarRightNavBarRightPaddingPx; - hotseat.getLayout().setPadding(mInsets.left, mInsets.top, mInsets.right + paddingRight, + hotseat.getLayout().setPadding(mInsets.left + cellLayoutPaddingLeftRightPx, + mInsets.top, mInsets.right + paddingRight + cellLayoutPaddingLeftRightPx, workspacePadding.bottom); } else if (isTablet) { // Pad the hotseat with the workspace padding calculated above lp.gravity = Gravity.BOTTOM; lp.width = LayoutParams.MATCH_PARENT; lp.height = hotseatBarHeightPx + mInsets.bottom; - hotseat.getLayout().setPadding(hotseatAdjustment + workspacePadding.left, - hotseatBarTopPaddingPx, hotseatAdjustment + workspacePadding.right, + hotseat.getLayout().setPadding(hotseatAdjustment + workspacePadding.left + + cellLayoutPaddingLeftRightPx, + hotseatBarTopPaddingPx, + hotseatAdjustment + workspacePadding.right + cellLayoutPaddingLeftRightPx, hotseatBarBottomPaddingPx + mInsets.bottom); } else { // For phones, layout the hotseat without any bottom margin @@ -613,11 +616,12 @@ public class DeviceProfile { lp.gravity = Gravity.BOTTOM; lp.width = LayoutParams.MATCH_PARENT; lp.height = hotseatBarHeightPx + mInsets.bottom; - hotseat.getLayout().setPadding(hotseatAdjustment + workspacePadding.left, - hotseatBarTopPaddingPx, hotseatAdjustment + workspacePadding.right, + hotseat.getLayout().setPadding(hotseatAdjustment + workspacePadding.left + + cellLayoutPaddingLeftRightPx, + hotseatBarTopPaddingPx, + hotseatAdjustment + workspacePadding.right + cellLayoutPaddingLeftRightPx, hotseatBarBottomPaddingPx + mInsets.bottom); } - hotseat.setPadding(cellLayoutPaddingLeftRightPx, 0, cellLayoutPaddingLeftRightPx, 0); hotseat.setLayoutParams(lp); // Layout the page indicators |