From 95016d0ec1975b5ff9e2cd3a539b06ddd415893e Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Sun, 10 Oct 2021 11:54:32 +0700
Subject: [PATCH] Fix window corner radius override

---
 .../android/systemui/shared/system/QuickStepContract.java  | 6 ++++++
 lawnchair/src/app/lawnchair/LawnchairLauncher.kt           | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/SystemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java b/SystemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java
index 2a79224134..7a4c84780f 100644
--- a/SystemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java
+++ b/SystemUIShared/src/com/android/systemui/shared/system/QuickStepContract.java
@@ -269,12 +269,18 @@ public class QuickStepContract {
         return mode == NAV_BAR_MODE_3BUTTON;
     }
 
+    public static boolean sHasCustomCornerRadius = false;
+    public static float sCustomCornerRadius = 0f;
+
     /**
      * Corner radius that should be used on windows in order to cover the display.
      * These values are expressed in pixels because they should not respect display or font
      * scaling, this means that we don't have to reload them on config changes.
      */
     public static float getWindowCornerRadius(Resources resources) {
+        if (sHasCustomCornerRadius) {
+            return sCustomCornerRadius;
+        }
         return ScreenDecorationsUtils.getWindowCornerRadius(resources);
     }
 
diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
index 4f625fc603..1aac009458 100644
--- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
+++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt
@@ -44,6 +44,7 @@ import com.android.launcher3.uioverrides.QuickstepLauncher
 import com.android.launcher3.uioverrides.states.OverviewState
 import com.android.launcher3.util.Themes
 import com.android.systemui.plugins.shared.LauncherOverlayManager
+import com.android.systemui.shared.system.QuickStepContract
 import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
@@ -98,6 +99,12 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
                 }
             })
         }
+        prefs.overrideWindowCornerRadius.subscribeValues(this) {
+            QuickStepContract.sHasCustomCornerRadius = it
+        }
+        prefs.windowCornerRadius.subscribeValues(this) {
+            QuickStepContract.sCustomCornerRadius = it.toFloat()
+        }
     }
 
     override fun setupViews() {