| commit | ca670425a81eb331d12d8d96734e3c07f70eafdf | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Sat Jun 26 15:10:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 26 15:10:14 2021 +0000 |
| tree | 264d2def58e33425fe777af64c62b18632cebdc2 | |
| parent | 10966ba3dee3727a55f6a7659631d1719dd648fa [diff] | |
| parent | 48dbfcd1c87a9efa179ef5d97da1f2f5784bae50 [diff] |
Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651 Change-Id: I17cf64b9aa733dbe045626d66b287cbe085edbf5
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 2305c60..d076be6 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -196,7 +196,7 @@ icon.mFolderName.setText(folderInfo.title); icon.mFolderName.setCompoundDrawablePadding(0); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams(); - lp.topMargin = grid.cellYPaddingPx + grid.iconSizePx + grid.iconDrawablePaddingPx; + lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx; icon.setTag(folderInfo); icon.setOnClickListener(ItemClickHandler.INSTANCE);