diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-06-25 18:06:23 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-06-25 18:15:29 -0700 |
commit | 72b5fd186e7c9399b9c7853d1fc1f3d678ce5f30 (patch) | |
tree | aa77491d9c2fc7b626021de4ef12a9fcf2ce20ea | |
parent | 374d170f965f796b826acfa7f7c277bf19953f61 (diff) | |
download | android_packages_apps_Trebuchet-72b5fd186e7c9399b9c7853d1fc1f3d678ce5f30.tar.gz android_packages_apps_Trebuchet-72b5fd186e7c9399b9c7853d1fc1f3d678ce5f30.tar.bz2 android_packages_apps_Trebuchet-72b5fd186e7c9399b9c7853d1fc1f3d678ce5f30.zip |
Grid change polish bugs.
- Folder icons were too small in landscape.
- Folders can now be 16dp away from the edge
(used to be 64dp which resulted in super small folders)
- Decrease page spacing back to 8dp
- Decrease PreviewBackground accept scale factor since
hotseat is now generally smaller.
Bug: 37014334
Bug: 37015359
Change-Id: Icbb53d34136bfdb93796d48f7379da6b9e214345
-rw-r--r-- | res/values-land/dimens.xml | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/folder/PreviewBackground.java | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 08073ce0d..0db0e615f 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -27,8 +27,7 @@ <!-- Dynamic grid --> <dimen name="dynamic_grid_overview_bar_item_width">120dp</dimen> <dimen name="dynamic_grid_page_indicator_size">24dp</dimen> - <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen> - <dimen name="dynamic_grid_cell_padding_x">8dp</dimen> + <dimen name="folder_preview_padding">5dp</dimen> <!-- Hotseat --> <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">18dp</dimen> diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index dcfb268d1..eef651044 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -344,7 +344,7 @@ public class DeviceProfile { updateFolderCellSize(1f, dm, res); // Don't let the folder get too close to the edges of the screen. - int folderMargin = 4 * edgeMarginPx; + int folderMargin = edgeMarginPx; // Check if the icons fit within the available height. float usedHeight = folderCellHeightPx * inv.numFolderRows + folderBottomPanelSize; @@ -497,7 +497,7 @@ public class DeviceProfile { // In portrait, we want the pages spaced such that there is no // overhang of the previous / next page into the current page viewport. // We assume symmetrical padding in portrait mode. - return Math.max(defaultPageSpacingPx, getWorkspacePadding(null).left + 1); + return Math.max(defaultPageSpacingPx, getWorkspacePadding(null).left / 2 + 1); } } diff --git a/src/com/android/launcher3/folder/PreviewBackground.java b/src/com/android/launcher3/folder/PreviewBackground.java index 44ebbcda7..eb6a6d5d8 100644 --- a/src/com/android/launcher3/folder/PreviewBackground.java +++ b/src/com/android/launcher3/folder/PreviewBackground.java @@ -88,7 +88,7 @@ public class PreviewBackground { public boolean isClipping = true; // Drawing / animation configurations - private static final float ACCEPT_SCALE_FACTOR = 1.25f; + private static final float ACCEPT_SCALE_FACTOR = 1.20f; private static final float ACCEPT_COLOR_MULTIPLIER = 1.5f; // Expressed on a scale from 0 to 255. |