diff options
| author | Winson Chung <winsonc@google.com> | 2013-10-29 01:33:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-29 01:34:00 +0000 |
| commit | 88400d521e9c46382d835f42c1d50235cf99b2eb (patch) | |
| tree | 6cb182d6e62b697608a176498d5a9a3aec7b34ad /src/com/android/launcher3/Folder.java | |
| parent | 76bf5553e083aea1aa91f07d4a9433263501c575 (diff) | |
| parent | 6e1c0d34bb31cacc24c57c89ab01deaa8985814f (diff) | |
| download | android_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.tar.gz android_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.tar.bz2 android_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.zip | |
Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index b5034d0e0..bd6101080 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -957,9 +957,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList Rect workspacePadding = grid.getWorkspacePadding(grid.isLandscape ? CellLayout.LANDSCAPE : CellLayout.PORTRAIT); int maxContentAreaHeight = grid.availableHeightPx - - 4 * grid.edgeMarginPx - workspacePadding.top - workspacePadding.bottom - - getPaddingTop() - getPaddingBottom() - mFolderNameHeight; return Math.min(maxContentAreaHeight, mContent.getDesiredHeight()); |