commit | 0b52655aa603e11eb453928b4de93213dc440fc2 | [log] [tgz] |
---|---|---|
author | Jonathan Miranda <jonmiranda@google.com> | Sat Jun 26 15:10:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 26 15:10:11 2021 +0000 |
tree | 1ea349e65f07f1af09081e3fdb63e325c7a7c562 | |
parent | 89b0a538b49863b0c408fa95f0b47b0403b5ae22 [diff] | |
parent | 66e6d991df8d9d2cdca8948805ab7466c9a33bbf [diff] |
Merge "Fix folder icon text alignment." into sc-dev am: 48dbfcd1c8 am: 66e6d991df Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111651 Change-Id: I62991969bea1db6c0166955c3225de9eb7c89c7b
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);