diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-04-24 03:06:54 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-04-26 06:00:21 +0000 |
| commit | d5190522817a6150bc1f9198a35ca0a7938a7eff (patch) | |
| tree | 44b9a2bb6a9bfe0f4bb64712cf6358744fa2a3bc | |
| parent | 0e96f3fea90ffaf2da20a9c5476e342c8f866d76 (diff) | |
| download | android_packages_apps_Trebuchet-d5190522817a6150bc1f9198a35ca0a7938a7eff.tar.gz android_packages_apps_Trebuchet-d5190522817a6150bc1f9198a35ca0a7938a7eff.tar.bz2 android_packages_apps_Trebuchet-d5190522817a6150bc1f9198a35ca0a7938a7eff.zip | |
Separating top and bottom paddings for the hotseat
Bug: 37616877
Change-Id: I2f187576c28d62f9bb8257c9b9295edb7a8e44c0
(cherry picked from commit 751e41eb666e3ad19f1d0ca8eeebe3b2265795fc)
| -rw-r--r-- | res/values/dimens.xml | 9 | ||||
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ca74f15af..75618b894 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -26,14 +26,17 @@ <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen> <dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen> <dimen name="dynamic_grid_overview_bar_spacer_width">25dp</dimen> - <dimen name="dynamic_grid_hotseat_height">88dp</dimen> - <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen> - <dimen name="dynamic_grid_hotseat_gutter_width">24dp</dimen> <dimen name="dynamic_grid_workspace_top_padding">12dp</dimen> <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen> <!-- Minimum space between workspace and hotseat in spring loaded mode --> <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen> + <!-- Hotseat --> + <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen> + <dimen name="dynamic_grid_hotseat_bottom_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_height">80dp</dimen> + <dimen name="dynamic_grid_hotseat_land_gutter_width">24dp</dimen> + <!-- Drop target bar --> <dimen name="dynamic_grid_drop_target_size">48dp</dimen> <dimen name="vert_drop_target_vertical_gap">20dp</dimen> diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index e47031ae8..c32f2d550 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -191,11 +191,14 @@ public class DeviceProfile { dropTargetBarSizePx = res.getDimensionPixelSize(R.dimen.dynamic_grid_drop_target_size); workspaceSpringLoadedBottomSpace = res.getDimensionPixelSize(R.dimen.dynamic_grid_min_spring_loaded_space); - hotseatBarHeightPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_height); + hotseatBarTopPaddingPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding); - hotseatBarBottomPaddingPx = 0; - hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_gutter_width); + hotseatBarBottomPaddingPx = + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_bottom_padding); + hotseatBarHeightPx = hotseatBarTopPaddingPx + hotseatBarBottomPaddingPx + + res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_height); + hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_land_gutter_width); // Determine sizes. widthPx = width; |