diff options
author | Winson Chung <winsonc@google.com> | 2013-09-13 11:14:45 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-13 11:40:05 -0700 |
commit | 11a1a53651924b544513f1f6971a735b18d67539 (patch) | |
tree | b949b9438dd1b47c01e56574d2dc13fbd9cad7a1 /src/com/android/launcher3/DynamicGrid.java | |
parent | c639f8cdab11c603e25b5ae38282dddcb939d401 (diff) | |
download | android_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.tar.gz android_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.tar.bz2 android_packages_apps_Trebuchet-11a1a53651924b544513f1f6971a735b18d67539.zip |
Fixing issue with folders not showing up.
- Add long click on empty spaces in hotseat to show overview mode
- Limit the height of all apps to the workspace + hotseat size
- Fixing some comments
Change-Id: Ie5a97a8b04e449385e2b3f6230079aebf8e15d5a
Diffstat (limited to 'src/com/android/launcher3/DynamicGrid.java')
-rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index f43af615f..70f000053 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -223,17 +223,16 @@ class DeviceProfile { availableWidthPx = awPx; availableHeightPx = ahPx; - if (isLandscape) { - allAppsNumRows = (int) numRows - 1; - } else { - allAppsNumRows = (int) numRows + 1; - } Rect padding = getWorkspacePadding(isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT); int pageIndicatorOffset = resources.getDimensionPixelSize(R.dimen.apps_customize_page_indicator_offset); - allAppsNumRows = (availableHeightPx - pageIndicatorOffset - 4 * edgeMarginPx) / - (iconSizePx + iconTextSizePx + 2 * edgeMarginPx); + if (isLandscape) { + allAppsNumRows = (availableHeightPx - pageIndicatorOffset - 4 * edgeMarginPx) / + (iconSizePx + iconTextSizePx + 2 * edgeMarginPx); + } else { + allAppsNumRows = (int) numRows + 1; + } allAppsNumCols = (availableWidthPx - padding.left - padding.right - 2 * edgeMarginPx) / (iconSizePx + 2 * edgeMarginPx); } |