| commit | 66e6d991df8d9d2cdca8948805ab7466c9a33bbf | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Fri Jun 25 22:44:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 25 22:44:34 2021 +0000 |
| tree | 19488b3cebe1d9afde2e9146a89ad70556eb5cf6 | |
| parent | 0785671ceb5ba29847ea8bd43dafb9db6a0824b2 [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: I81d0163155d57a2e37064f3317dedd1b2839c064
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 25a0141..e704957 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);