summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-07-31 18:15:13 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-07-31 18:15:13 +0000
commit36d5963b4a02826f91c6f00feb52a5d96ca54a18 (patch)
tree74ae3b66761c3ce7dd8b776f6b4a15c0b31c3949 /src
parente5f7acf74a89d4d3fc9d76380268d89fc6d0ee7e (diff)
parent5eacbb7fc11d9e58c8674e9fcb8c991b93a8167c (diff)
downloadandroid_packages_apps_Trebuchet-36d5963b4a02826f91c6f00feb52a5d96ca54a18.tar.gz
android_packages_apps_Trebuchet-36d5963b4a02826f91c6f00feb52a5d96ca54a18.tar.bz2
android_packages_apps_Trebuchet-36d5963b4a02826f91c6f00feb52a5d96ca54a18.zip
[automerger] Update launcher grid for tablet devices. am: 5eacbb7fc1
Change-Id: Ia3de5e3b9956047573cb1d09173021576bd8fa56
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 820c125e1..9839c12dc 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -59,6 +59,9 @@ public class DeviceProfile {
private static final float TALL_DEVICE_ASPECT_RATIO_THRESHOLD = 2.0f;
+ // To evenly space the icons, increase the left/right margins for tablets in portrait mode.
+ private static final int PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER = 4;
+
// Workspace
public final int desiredWorkspaceLeftRightMarginPx;
public final int cellLayoutPaddingLeftRightPx;
@@ -172,7 +175,9 @@ public class DeviceProfile {
defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null);
edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);
desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx;
- cellLayoutPaddingLeftRightPx =
+ int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet
+ ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1;
+ cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier *
res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding);
cellLayoutBottomPaddingPx =
res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_bottom_padding);