| commit | 741a8e34cf4dda4bed51160d9c840fa3eb252a3e | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Wed Apr 21 16:34:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 16:34:53 2021 +0000 |
| tree | 85c3d8182f5a53c3e60cf14c4fdc434bbb987260 | |
| parent | 6fefc5c9912814c4c196d3f8c0b501286ff9e944 [diff] | |
| parent | e9a0ab33fa3fa469130cd96ea59f5fe82cffd2fa [diff] |
Merge "Use cellHeightPx to estimate recommended widgets' height" into sc-dev am: e9a0ab33fa Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14265965 Change-Id: I8a69020e19228ce046e3321bc213bdd4bbafd018
diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index 824b580..1aefe41 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java
@@ -146,7 +146,7 @@ List<WidgetItem> widgetItems = recommendedWidgetsInTable.get(i); float rowHeight = 0; for (int j = 0; j < widgetItems.size(); j++) { - float previewHeight = widgetItems.get(j).spanY * deviceProfile.allAppsCellHeightPx + float previewHeight = widgetItems.get(j).spanY * deviceProfile.cellHeightPx * previewScale; rowHeight = Math.max(rowHeight, previewHeight + mWidgetCellTextViewsHeight); }