OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b25e684
)
Revert "Reverting folder cell width on portrait phones."
author
Tony Wickham
<twickham@google.com>
Thu, 12 Nov 2015 23:46:33 +0000
(23:46 +0000)
committer
Tony Wickham
<twickham@google.com>
Thu, 12 Nov 2015 23:46:33 +0000
(23:46 +0000)
This reverts commit
b25e684a766362422f5693f7a2189910c1275584
.
Change-Id: Ie86adc4b35c73ab7ef78d73225b437adc4751172
src/com/android/launcher3/DeviceProfile.java
patch
|
blob
|
history
diff --git
a/src/com/android/launcher3/DeviceProfile.java
b/src/com/android/launcher3/DeviceProfile.java
index
ccbfba1
..
c0ad516
100644
(file)
--- a/
src/com/android/launcher3/DeviceProfile.java
+++ b/
src/com/android/launcher3/DeviceProfile.java
@@
-245,9
+245,7
@@
public class DeviceProfile {
hotseatCellHeightPx = iconSizePx;
// Folder
- int folderCellPadding = isTablet || isLandscape ? 6 * edgeMarginPx : 3 * edgeMarginPx;
- // Don't let the folder get too close to the edges of the screen.
- folderCellWidthPx = Math.min(cellWidthPx + folderCellPadding,
+ folderCellWidthPx = Math.min(cellWidthPx + 6 * edgeMarginPx,
(availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns);
folderCellHeightPx = cellHeightPx + edgeMarginPx;
folderBackgroundOffset = -edgeMarginPx;