summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTyson Miller <tmiller@cyngn.com>2016-01-11 15:40:38 -0800
committerTyson Miller <tmiller@cyngn.com>2016-01-11 15:57:20 -0800
commiteb5bc4f3dc84497a3d62306a1eb73ba7b87f182d (patch)
treefebf6f1c7dffb898457d84ba21378efe3c626951 /src
parent80d4ff8dcbb28f3880c312568945b55294f25a4b (diff)
downloadandroid_packages_apps_Trebuchet-eb5bc4f3dc84497a3d62306a1eb73ba7b87f182d.tar.gz
android_packages_apps_Trebuchet-eb5bc4f3dc84497a3d62306a1eb73ba7b87f182d.tar.bz2
android_packages_apps_Trebuchet-eb5bc4f3dc84497a3d62306a1eb73ba7b87f182d.zip
Trebuchet: RemoteFolder: fix folder increasing top margin & adjust badge position
Change-Id: Iea364efc9ab96df1f223ae2dcb9c0a64ac175bbf
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Folder.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index dfd4fd35a..1cad48d3d 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1347,6 +1347,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
int left = (grid.availableWidthPx - width) / 2;
// Drop the top down a little so it isn't bounded by the page indicators
int top = (int) (bounds.top + (bounds.height() * 1.15) - height);
+ // Make sure the top margin stays consistent
+ lp.topMargin = getResources().getDimensionPixelSize(R.dimen.folder_margin);
if (width >= bounds.width()) {
// If the folder doesn't fit within the bounds, center it about the desired bounds