From 1fb075de3b6c41a748ea0abc0baaf20890cad18d Mon Sep 17 00:00:00 2001
From: Thales Lima <tsuharesu@google.com>
Date: Wed, 10 Aug 2022 10:47:50 +0100
Subject: [PATCH] Tune display options for non-default display sizes

Fix: 241382721
Test: manual
Change-Id: I05379c359dabad6931ee897455aa847a7a9b470c
---
 res/values/attrs.xml                                  | 2 ++
 src/com/android/launcher3/InvariantDeviceProfile.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 28d094b138..df1ca14de2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -281,6 +281,8 @@
         <!-- defaults to iconImageSize, if not specified -->
         <attr name="allAppsIconSize" format="float" />
         <!-- defaults to allAppsIconSize, if not specified -->
+        <attr name="allAppsIconSizeLandscape" format="float" />
+        <!-- defaults to allAppsIconSize, if not specified -->
         <attr name="allAppsIconSizeTwoPanelPortrait" format="float" />
         <!-- defaults to allAppsIconSize, if not specified -->
         <attr name="allAppsIconSizeTwoPanelLandscape" format="float" />
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 21eba00ee2..cf2a3f8474 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -1004,7 +1004,9 @@ public class InvariantDeviceProfile {
 
             allAppsIconSizes[INDEX_DEFAULT] = a.getFloat(
                     R.styleable.ProfileDisplayOption_allAppsIconSize, iconSizes[INDEX_DEFAULT]);
-            allAppsIconSizes[INDEX_LANDSCAPE] = allAppsIconSizes[INDEX_DEFAULT];
+            allAppsIconSizes[INDEX_LANDSCAPE] = a.getFloat(
+                    R.styleable.ProfileDisplayOption_allAppsIconSizeLandscape,
+                    iconSizes[INDEX_DEFAULT]);
             allAppsIconSizes[INDEX_TWO_PANEL_PORTRAIT] = a.getFloat(
                     R.styleable.ProfileDisplayOption_allAppsIconSizeTwoPanelPortrait,
                     allAppsIconSizes[INDEX_DEFAULT]);