From 4774388a0302fc10ef53ce24bc014f2e87c1b8c1 Mon Sep 17 00:00:00 2001 From: Yasan Ghaffarian Date: Mon, 6 Jun 2022 13:13:09 +0430 Subject: [PATCH] Allow toggling enforced widget corner radius on Android S+ Co-authored-by: Daria Hamrah Paytakht --- .../ui/preferences/HomeScreenPreferences.kt | 12 +++++------- .../launcher3/widget/RoundedCornerEnforcement.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt index f47747d1db..05cb7e55a0 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt @@ -149,13 +149,11 @@ fun HomeScreenPreferences() { ) } } - if (!Utilities.ATLEAST_S) { - PreferenceGroup(heading = stringResource(id = R.string.widget_button_text)) { - SwitchPreference( - adapter = prefs2.roundedWidgets.getAdapter(), - label = stringResource(id = R.string.force_rounded_widgets), - ) - } + PreferenceGroup(heading = stringResource(id = R.string.widget_button_text)) { + SwitchPreference( + adapter = prefs2.roundedWidgets.getAdapter(), + label = stringResource(id = R.string.force_rounded_widgets), + ) } } } diff --git a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java index 39c758b953..086c7c9a30 100644 --- a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java +++ b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java @@ -75,7 +75,7 @@ public class RoundedCornerEnforcement { /** Check if the app widget is in the deny list. */ public static boolean isRoundedCornerEnabled() { - return Utilities.ATLEAST_S || sRoundedCornerEnabled; + return sRoundedCornerEnabled; } /**