| commit | 9607e28ad88e5df34d7284622f1063155b7aaaa2 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Wed Apr 21 16:35:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 16:35:09 2021 +0000 |
| tree | 103b6ddd0f9054f35633b86836a2edbbb380d68a | |
| parent | 781a765064ceee0395ebe1b9b0f1e12fb078dbe4 [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: I3f47c1b3c1804a752b0c82d3013001fd0625c69b
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); }