commit 37292eb2308542a970d5dad6fc2cc674c57be913
author Alex Chau <alexchau@google.com> Tue Dec 20 19:01:14 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 20 19:01:14 2022 +0000
tree b111acf695d8586bf51b394cd8edea463a90359c
parent d79e53a5c8d8f38d69d007d8da25b977dd316f0d
parent 0d4f1ac30e68d26037a1d98bf3cc324b5fddfba2

Merge "folderChild icon and text size should follow the respective configuration" into tm-qpr-dev

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 4a22f73..25520e1 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -1048,12 +1048,9 @@
     }
 
     private void updateFolderCellSize(float scale, Resources res) {
-        float invIconSizeDp = isVerticalBarLayout()
-                ? inv.iconSize[INDEX_LANDSCAPE]
-                : inv.iconSize[INDEX_DEFAULT];
+        float invIconSizeDp = inv.iconSize[mTypeIndex];
         folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));
-        folderChildTextSizePx =
-                pxFromSp(inv.iconTextSize[INDEX_DEFAULT], mMetrics, scale);
+        folderChildTextSizePx = pxFromSp(inv.iconTextSize[mTypeIndex], mMetrics, scale);
         folderLabelTextSizePx = Math.max(pxFromSp(MIN_FOLDER_TEXT_SIZE_SP, mMetrics),
                 (int) (folderChildTextSizePx * folderLabelTextScale));