From 7c5cde46e776dbfe362bddab05432963169c8087 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 21 Jun 2022 08:23:43 +0800
Subject: [PATCH 1/3] Minor string re-arranging, create desc for "wallpaper
 depth", and create section "wallpaper" with wallpaper-related settings

---
 lawnchair/res/values/strings.xml              | 40 ++++++++++++-------
 .../ui/preferences/HomeScreenPreferences.kt   | 27 +++++++------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index c9a6dcdbdb..cb7cca8fae 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -232,6 +232,8 @@
     <string name="search_provider_presearch" translatable="false">Presearch</string>
     <string name="search_provider_bing" translatable="false">Bing</string>
     <string name="search_provider_sesame" translatable="false">Sesame</string>
+    <string name="always_open_website_label">Always Open Website</string>
+    <string name="always_open_website_description">Open search provider’s website even if their app is installed.</string>
     <string name="search_provider">Search Provider</string>
     <string name="status_bar_label">Status Bar</string>
     <string name="show_notification_count">Show Notification Count</string>
@@ -240,7 +242,7 @@
     <string name="reset_custom_icons_confirmation">All custom icons will be reset. Do you want to continue?</string>
     <string name="taskbar_label">Taskbar</string>
     <string name="enable_taskbar_experimental">Enable Taskbar (Experimental)</string>
-    <string name="error_no_market_or_browser_installed">No app store or browser installed.</string>
+    <string name="error_no_market_or_browser_installed">No app market or browser installed.</string>
 
     <!-- Smartspace -->
     <string name="generic_smartspace_concatenated_desc">%1$s, %2$s</string>
@@ -255,12 +257,11 @@
     <string name="smartspace_battery_charging">Charging</string>
     <string name="smartspace_battery_full">Charged</string>
     <string name="smartspace_battery_low">Battery Low</string>
+    <string name="battery_charging_percentage_charging_time">"%1$d%% — Full in %2$s"</string>
     <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
     <string name="smartspace_widget">At a Glance</string>
     <string name="smartspace_widget_description">What to Show</string>
     <string name="smartspace_widget_placeholder_date">Fri, Mar 3</string>
-    <string name="quickstep_incompatible">Incompatible System Integration</string>
-    <string name="quickstep_incompatible_description">Your device is configured to have system gestures (known as Quickstep) provided by %1$s, but this version of %1$s is not compatible with your Android version. To continue using your device, please uninstall %1$s updates or disable %1$s as a system-gesture provider.</string>
 
     <string name="preview_label">Preview</string>
     <string name="smartspace_calendar">Calendar</string>
@@ -278,6 +279,9 @@
     <string name="smartspace_calendar_gregorian">Gregorian</string>
     <string name="smartspace_calendar_persian">Persian</string>
 
+    <string name="quickstep_incompatible">Incompatible System Integration</string>
+    <string name="quickstep_incompatible_description">Your device is configured to have system gestures (known as Quickstep) provided by %1$s, but this version of %1$s is not compatible with your Android version. To continue using your device, please uninstall %1$s updates or disable %1$s as a system-gesture provider.</string>
+
     <string name="pref_fonts_add_fonts">Add Fonts</string>
     <string name="pref_fonts_add_fonts_summary">OTF &amp; TTF supported.</string>
     <string name="delete">Delete</string>
@@ -285,6 +289,7 @@
     <string name="themed_icons_home_label">Home Screen</string>
     <string name="themed_icons_home_and_drawer_label">Home Screen &amp; App Drawer</string>
 
+    <!-- Backup -->
     <string name="create_backup">Create Backup</string>
     <string name="create_backup_action">Create</string>
     <string name="what_to_backup">What to Back Up</string>
@@ -298,26 +303,33 @@
     <string name="backup_restore_success">Backup restored.</string>
     <string name="backup_restore_error">Failed to restore backup.</string>
     <string name="invalid_backup_file">Invalid backup file.</string>
+
     <string name="google_folder_title" translatable="false">Google</string>
-    <string name="battery_charging_percentage_charging_time">"%1$d%% — Full in %2$s"</string>
-    <string name="wallpaper_depth_effect">Wallpaper Depth Effect</string>
-    <string name="gesture_double_tap">Double Tap</string>
+
+    <string name="wallpaper_depth_effect_label">Wallpaper Depth Effect</string>
+    <string name="wallpaper_depth_effect_description">Zoom in and out of the wallpaper when transitioning between states</string>
+
+    <string name="gestures_label">Gestures</string>
+
+    <!-- Gestures -->
+    <string name="gesture_double_tap">Double-Tap</string>
+    <string name="gesture_swipe_up">Swipe Up</string>
+    <string name="gesture_swipe_down">Swipe Down</string>
+    <string name="gesture_home_tap">Home Button Tap</string>
+    <string name="gesture_back_tap">Back Button Tap</string>
+
     <string name="gesture_handler_no_op">Do Nothing</string>
     <string name="gesture_handler_sleep">Sleep</string>
     <string name="gesture_handler_open_notifications">Open Notification Panel</string>
     <string name="gesture_handler_open_app_option">Open App</string>
     <string name="gesture_handler_open_app_config">Open %1$s</string>
-    <string name="pick_app_for_gesture">Pick App</string>
     <string name="gesture_handler_open_app_drawer">Open App Drawer</string>
     <string name="gesture_handler_open_app_search">Open App Search</string>
     <string name="gesture_handler_open_search">Open Search</string>
-    <string name="gestures_label">Gestures</string>
-    <string name="gestures_description">Taps and Swipes</string>
-    <string name="gesture_swipe_up">Swipe Up</string>
-    <string name="gesture_swipe_down">Swipe Down</string>
-    <string name="gesture_home_tap">Home Button Tap</string>
-    <string name="gesture_back_tap">Back Button Tap</string>
+
+    <string name="pick_app_for_gesture">Pick App</string>
+    
     <string name="x_and_y">%s &amp; %s</string>
     <string name="app_label">App</string>
     <string name="website_label">Website</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
index 05cb7e55a0..6c1b6085fb 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
@@ -59,19 +59,9 @@ fun HomeScreenPreferences() {
                 label = stringResource(id = R.string.auto_add_shortcuts_label),
                 enabled = lockHomeScreenAdapter.state.value.not(),
             )
-            SwitchPreference(
-                prefs.wallpaperScrolling.getAdapter(),
-                label = stringResource(id = R.string.wallpaper_scrolling_label),
-            )
-            if (Utilities.ATLEAST_R) {
-                SwitchPreference(
-                    prefs2.wallpaperDepthEffect.getAdapter(),
-                    label = stringResource(id = R.string.wallpaper_depth_effect),
-                )
-            }
             GestureHandlerPreference(
                 adapter = prefs2.doubleTapGestureHandler.getAdapter(),
-                label = stringResource(id = R.string.gesture_double_tap)
+                label = stringResource(id = R.string.gesture_double_tap),
             )
             val feedAvailable = OverlayCallbackImpl.minusOneAvailable(LocalContext.current)
             SwitchPreference(
@@ -80,6 +70,19 @@ fun HomeScreenPreferences() {
                 description = if (feedAvailable) null else stringResource(id = R.string.minus_one_unavailable),
                 enabled = feedAvailable,
             )
+        }
+        PreferenceGroup(heading = stringResource(id = R.string.wallpaper)) {
+            SwitchPreference(
+                prefs.wallpaperScrolling.getAdapter(),
+                label = stringResource(id = R.string.wallpaper_scrolling_label),
+            )
+            if (Utilities.ATLEAST_R) {
+                SwitchPreference(
+                    prefs2.wallpaperDepthEffect.getAdapter(),
+                    label = stringResource(id = R.string.wallpaper_depth_effect_label),
+                    description = stringResource(id = R.string.wallpaper_depth_effect_description),
+                )
+            }
             SwitchPreference(
                 adapter = prefs2.showTopShadow.getAdapter(),
                 label = stringResource(id = R.string.show_sys_ui_scrim),
@@ -156,4 +159,4 @@ fun HomeScreenPreferences() {
             )
         }
     }
-}
+}
\ No newline at end of file

From f096a23e94e6e5684f62961a41607062d2433dec Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 21 Jun 2022 15:59:09 +0800
Subject: [PATCH 2/3] Rename app market to app store

---
 lawnchair/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index cb7cca8fae..0ed55aa46a 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -242,7 +242,7 @@
     <string name="reset_custom_icons_confirmation">All custom icons will be reset. Do you want to continue?</string>
     <string name="taskbar_label">Taskbar</string>
     <string name="enable_taskbar_experimental">Enable Taskbar (Experimental)</string>
-    <string name="error_no_market_or_browser_installed">No app market or browser installed.</string>
+    <string name="error_no_market_or_browser_installed">No app store or browser installed.</string>
 
     <!-- Smartspace -->
     <string name="generic_smartspace_concatenated_desc">%1$s, %2$s</string>
@@ -332,4 +332,4 @@
     <string name="x_and_y">%s &amp; %s</string>
     <string name="app_label">App</string>
     <string name="website_label">Website</string>
-</resources>
\ No newline at end of file
+</resources>

From c3bb51133e5ca5938a973132b02087fed4692a41 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:19:33 +0800
Subject: [PATCH 3/3] Do requested changes

---
 lawnchair/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index 0ed55aa46a..d16061eb8b 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -307,12 +307,12 @@
     <string name="google_folder_title" translatable="false">Google</string>
 
     <string name="wallpaper_depth_effect_label">Wallpaper Depth Effect</string>
-    <string name="wallpaper_depth_effect_description">Zoom in and out of the wallpaper when transitioning between states</string>
+    <string name="wallpaper_depth_effect_description">Zoom into and out of the wallpaper when transitioning between states.</string>
 
     <string name="gestures_label">Gestures</string>
 
     <!-- Gestures -->
-    <string name="gesture_double_tap">Double-Tap</string>
+    <string name="gesture_double_tap">Double Tap</string>
     <string name="gesture_swipe_up">Swipe Up</string>
     <string name="gesture_swipe_down">Swipe Down</string>
     <string name="gesture_home_tap">Home Button Tap</string>