From 376c279ed0b2dfcfbd1665baa36c6f625c4cd58c Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:45:28 +0800
Subject: [PATCH] Fix horizontal drawer padding

This is a very temporary fix until we actually improve the behavior or responsive grid

Closes #4513
---
 .../search/LawnchairSearchAdapterProvider.kt         |  2 +-
 src/com/android/launcher3/DeviceProfile.java         | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt b/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt
index 1dd74bb585..c51b52d6ab 100644
--- a/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt
@@ -70,7 +70,7 @@ class LawnchairSearchAdapterProvider(
     ): BaseAllAppsAdapter.ViewHolder {
         val view = layoutInflater.inflate(layoutIdMap[viewType], parent, false)
         val grid: DeviceProfile = mLauncher.deviceProfile
-        val horizontalMargin = if (grid.isTablet) grid.allAppsPadding.left + grid.allAppsPadding.right + 48 else grid.allAppsPadding.left + grid.allAppsPadding.right
+        val horizontalMargin = grid.allAppsPadding.left + grid.allAppsPadding.right
 
         if (viewType != SEARCH_RESULT_ICON) {
             val layoutParams = ViewGroup.MarginLayoutParams(view.layoutParams)
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 8997eeb678..fef77acf54 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -41,6 +41,7 @@ import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.util.SparseArray;
 import android.view.Surface;
 
@@ -1460,8 +1461,13 @@ public class DeviceProfile {
                 .firstBlocking(preferenceManager2.getDrawerLeftRightMarginFactor());
         var marginMultiplier = allAppLeftRightMarginMultiplier * (!isTablet ? 100 : 2);
         allAppsLeftRightMargin = (int) (allAppsLeftRightMargin * marginMultiplier);
-        allAppsPadding.left = (int) (allAppsPadding.left * marginMultiplier);
-        allAppsPadding.right = (int) (allAppsPadding.right * marginMultiplier);
+        
+        // todo fix how drawer padding values are calculated in responsive grid type
+        int leftPadding = (int) (allAppsPadding.left != 0 ? allAppsPadding.left * marginMultiplier : marginMultiplier);
+        int rightPadding = (int) (allAppsPadding.right != 0 ? allAppsPadding.right * marginMultiplier : marginMultiplier);
+        
+        allAppsPadding.left = leftPadding;
+        allAppsPadding.right = rightPadding;
     }
 
     private void setupAllAppsStyle(Context context) {
@@ -2434,4 +2440,4 @@ public class DeviceProfile {
                     mIsGestureMode, mViewScaleProvider, mOverrideProvider, mIsTransientTaskbar);
         }
     }
-}
\ No newline at end of file
+}