Merge pull request #2722

This commit is contained in:
Patryk Michalik
2022-06-21 21:00:16 +02:00
committed by GitHub
2 changed files with 38 additions and 23 deletions

View File

@@ -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 providers 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>
@@ -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,25 +303,32 @@
<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="wallpaper_depth_effect_label">Wallpaper Depth Effect</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_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>

View File

@@ -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() {
)
}
}
}
}