Skip to content

Commit 2a9e63b

Browse files
authored
Merge branch 'LawnchairLauncher:15-dev' into trunk
2 parents 90e6919 + 1417eaa commit 2a9e63b

File tree

64 files changed

+1122
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1122
-383
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ dependencies {
335335
implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-15.jar')
336336
withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-15.jar')
337337

338-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
338+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
339339

340340
implementation 'androidx.profileinstaller:profileinstaller:1.4.1'
341341
baselineProfile projects.baselineProfile
@@ -366,7 +366,7 @@ dependencies {
366366
implementation "androidx.constraintlayout:constraintlayout:2.2.0"
367367
implementation "androidx.palette:palette-ktx:1.0.0"
368368
implementation "androidx.slice:slice-core:1.1.0-alpha02"
369-
def accompanistVersion = '0.37.0'
369+
def accompanistVersion = '0.37.2'
370370
implementation "com.google.accompanist:accompanist-adaptive:$accompanistVersion"
371371
implementation "com.google.accompanist:accompanist-drawablepainter:$accompanistVersion"
372372
implementation "com.google.accompanist:accompanist-permissions:$accompanistVersion"

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.

lawnchair/res/values-af-rZA/strings.xml

+16-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@
3737
<string name="action_copy_link">Copy link</string>
3838
<string name="action_copy">Kopieer</string>
3939
<string name="action_paste">Paste</string>
40+
<string name="action_done">Klaar</string>
41+
<string name="select_all">Select all</string>
42+
<string name="deselect_all">Deselect all</string>
43+
<string name="inverse_selection">Inverse selection</string>
4044
<string name="loading">Laai tans…</string>
45+
<string name="download_update">Download update</string>
46+
<string name="install_update">Install update</string>
47+
<string name="pro_updated">You\'re up-to-date!</string>
4148
<string name="managed_by_lawnchair">Managed by Lawnchair</string>
4249
<!-- When mentioning settings UI -->
4350
<string name="smartspace_preferences">Voorkeure</string>
@@ -65,6 +72,7 @@
6572
<string name="layout">Uitleg</string>
6673
<!-- Generic styling options -->
6774
<string name="wallpaper">Muurpapier</string>
75+
<string name="style">Style</string>
6876
<string name="background_opacity">Background opacity</string>
6977
<!-- Toast text and tips -->
7078
<string name="copied_toast">Copied to clipboard</string>
@@ -75,9 +83,9 @@
7583
<string name="wallpapers">Wallpapers</string>
7684
<string name="caddy_beta">Caddy (Beta)</string>
7785
<string name="caddy">Caddy</string>
78-
<string name="app_drawer_folder">App drawer folder</string>
86+
<string name="app_drawer_folder">App drawer folders</string>
7987
<string name="app_drawer_folder_settings">Drawer folder</string>
80-
<string name="add_folder">Add folder</string>
88+
<string name="add_folder">Create folder</string>
8189
<string name="edit_folder">Edit folder</string>
8290
<string name="add_label">Add</string>
8391
<string name="edit_label">Edit</string>
@@ -86,11 +94,14 @@
8694
<string name="folder_list_note">Swipe left to edit, swipe right to delete, or tap to update items</string>
8795
<string name="apps_in_folder_label">Hide folder apps</string>
8896
<string name="apps_in_folder_description">Apps assigned to folders are excluded from app lists</string>
97+
<string name="folders_filter_duplicates">Only show unique apps</string>
8998
<string name="my_folder_label">My folder</string>
9099
<!-- A11y description -->
91-
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
100+
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
101+
<string name="x_with_y_count">%1$s (%2$d)</string>
92102
<string name="x_by_y">%1$d x %2$d</string>
93103
<string name="x_and_y">%1$s &amp; %2$s</string>
104+
<string name="advanced">Advanced</string>
94105
<!--
95106
96107
Preference Dashboard
@@ -361,6 +372,8 @@
361372
<string name="gesture_swipe_down">Swipe down</string>
362373
<string name="gesture_home_tap">Home button</string>
363374
<string name="gesture_back_tap">Back button</string>
375+
<string name="gesture_swipe_left">Swipe left</string>
376+
<string name="gesture_swipe_right">Swipe right</string>
364377
<string name="gesture_handler_no_op">Do nothing</string>
365378
<string name="gesture_handler_sleep">Sleep</string>
366379
<string name="gesture_handler_recents">Open Recents</string>

lawnchair/res/values-am-rET/strings.xml

+16-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@
3737
<string name="action_copy_link">Copy link</string>
3838
<string name="action_copy">Copy</string>
3939
<string name="action_paste">Paste</string>
40+
<string name="action_done">Done</string>
41+
<string name="select_all">Select all</string>
42+
<string name="deselect_all">Deselect all</string>
43+
<string name="inverse_selection">Inverse selection</string>
4044
<string name="loading">Loading…</string>
45+
<string name="download_update">Download update</string>
46+
<string name="install_update">Install update</string>
47+
<string name="pro_updated">You\'re up-to-date!</string>
4148
<string name="managed_by_lawnchair">Managed by Lawnchair</string>
4249
<!-- When mentioning settings UI -->
4350
<string name="smartspace_preferences">Preferences</string>
@@ -65,6 +72,7 @@
6572
<string name="layout">Layout</string>
6673
<!-- Generic styling options -->
6774
<string name="wallpaper">Wallpaper</string>
75+
<string name="style">Style</string>
6876
<string name="background_opacity">Background opacity</string>
6977
<!-- Toast text and tips -->
7078
<string name="copied_toast">Copied to clipboard</string>
@@ -75,9 +83,9 @@
7583
<string name="wallpapers">Wallpapers</string>
7684
<string name="caddy_beta">Caddy (Beta)</string>
7785
<string name="caddy">Caddy</string>
78-
<string name="app_drawer_folder">App drawer folder</string>
86+
<string name="app_drawer_folder">App drawer folders</string>
7987
<string name="app_drawer_folder_settings">Drawer folder</string>
80-
<string name="add_folder">Add folder</string>
88+
<string name="add_folder">Create folder</string>
8189
<string name="edit_folder">Edit folder</string>
8290
<string name="add_label">Add</string>
8391
<string name="edit_label">Edit</string>
@@ -86,11 +94,14 @@
8694
<string name="folder_list_note">Swipe left to edit, swipe right to delete, or tap to update items</string>
8795
<string name="apps_in_folder_label">Hide folder apps</string>
8896
<string name="apps_in_folder_description">Apps assigned to folders are excluded from app lists</string>
97+
<string name="folders_filter_duplicates">Only show unique apps</string>
8998
<string name="my_folder_label">My folder</string>
9099
<!-- A11y description -->
91-
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
100+
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
101+
<string name="x_with_y_count">%1$s (%2$d)</string>
92102
<string name="x_by_y">%1$d x %2$d</string>
93103
<string name="x_and_y">%1$s &amp; %2$s</string>
104+
<string name="advanced">Advanced</string>
94105
<!--
95106
96107
Preference Dashboard
@@ -361,6 +372,8 @@
361372
<string name="gesture_swipe_down">Swipe down</string>
362373
<string name="gesture_home_tap">Home button</string>
363374
<string name="gesture_back_tap">Back button</string>
375+
<string name="gesture_swipe_left">Swipe left</string>
376+
<string name="gesture_swipe_right">Swipe right</string>
364377
<string name="gesture_handler_no_op">Do nothing</string>
365378
<string name="gesture_handler_sleep">Sleep</string>
366379
<string name="gesture_handler_recents">Open Recents</string>

lawnchair/res/values-ar-rSA/strings.xml

+16-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@
3737
<string name="action_copy_link">نسخ الرابط</string>
3838
<string name="action_copy">نسخ</string>
3939
<string name="action_paste">لصق</string>
40+
<string name="action_done">تمّ</string>
41+
<string name="select_all">Select all</string>
42+
<string name="deselect_all">Deselect all</string>
43+
<string name="inverse_selection">Inverse selection</string>
4044
<string name="loading">جارٍ التحميل…</string>
45+
<string name="download_update">Download update</string>
46+
<string name="install_update">Install update</string>
47+
<string name="pro_updated">You\'re up-to-date!</string>
4148
<string name="managed_by_lawnchair">تتم الإدارة بواسطة Lawnchair</string>
4249
<!-- When mentioning settings UI -->
4350
<string name="smartspace_preferences">التفضيلات</string>
@@ -65,6 +72,7 @@
6572
<string name="layout">التصميم أو التخطيط</string>
6673
<!-- Generic styling options -->
6774
<string name="wallpaper">الخلفية</string>
75+
<string name="style">Style</string>
6876
<string name="background_opacity">شفافية الخلفية</string>
6977
<!-- Toast text and tips -->
7078
<string name="copied_toast">تم النسخ إلى الحافظة</string>
@@ -75,9 +83,9 @@
7583
<string name="wallpapers">Wallpapers</string>
7684
<string name="caddy_beta">Caddy (Beta)</string>
7785
<string name="caddy">Caddy</string>
78-
<string name="app_drawer_folder">App drawer folder</string>
86+
<string name="app_drawer_folder">App drawer folders</string>
7987
<string name="app_drawer_folder_settings">Drawer folder</string>
80-
<string name="add_folder">Add folder</string>
88+
<string name="add_folder">Create folder</string>
8189
<string name="edit_folder">Edit folder</string>
8290
<string name="add_label">Add</string>
8391
<string name="edit_label">Edit</string>
@@ -86,11 +94,14 @@
8694
<string name="folder_list_note">Swipe left to edit, swipe right to delete, or tap to update items</string>
8795
<string name="apps_in_folder_label">Hide folder apps</string>
8896
<string name="apps_in_folder_description">Apps assigned to folders are excluded from app lists</string>
97+
<string name="folders_filter_duplicates">Only show unique apps</string>
8998
<string name="my_folder_label">My folder</string>
9099
<!-- A11y description -->
91-
<string name="accessibility_service_description">لقفل هاتفك عند تنفيذ إيماءة، ولفتح التطبيقات الحديثة عبر الإيماءة، يحتاج Lawnchair إلى الوصول إلى خدمات الوصول. لا يراقب Lawnchair أي إجراء من المستخدم، على الرغم من أن هذه الصلاحية مطلوبة لجميع خدمات الوصول. يتجاهل Lawnchair أي حدث يتم إرساله من النظام. لقفل هاتفك، أو لفتح التطبيقات الحديثة، يستخدم Lawnchair خدمة الوصول performGlobalAction.</string>
100+
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
101+
<string name="x_with_y_count">%1$s (%2$d)</string>
92102
<string name="x_by_y">%1$d x %2$d</string>
93103
<string name="x_and_y">%1$s &amp; %2$s</string>
104+
<string name="advanced">Advanced</string>
94105
<!--
95106
96107
Preference Dashboard
@@ -361,6 +372,8 @@
361372
<string name="gesture_swipe_down">التمرير لأسفل</string>
362373
<string name="gesture_home_tap">زر الصفحة الرئيسية</string>
363374
<string name="gesture_back_tap">زر العودة</string>
375+
<string name="gesture_swipe_left">Swipe left</string>
376+
<string name="gesture_swipe_right">Swipe right</string>
364377
<string name="gesture_handler_no_op">لا تفعل شيئاً</string>
365378
<string name="gesture_handler_sleep">السكون</string>
366379
<string name="gesture_handler_recents">فتح التطبيقات الحديثة</string>

lawnchair/res/values-az-rAZ/strings.xml

+16-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@
3737
<string name="action_copy_link">Copy link</string>
3838
<string name="action_copy">Copy</string>
3939
<string name="action_paste">Paste</string>
40+
<string name="action_done">Done</string>
41+
<string name="select_all">Select all</string>
42+
<string name="deselect_all">Deselect all</string>
43+
<string name="inverse_selection">Inverse selection</string>
4044
<string name="loading">Loading…</string>
45+
<string name="download_update">Download update</string>
46+
<string name="install_update">Install update</string>
47+
<string name="pro_updated">You\'re up-to-date!</string>
4148
<string name="managed_by_lawnchair">Managed by Lawnchair</string>
4249
<!-- When mentioning settings UI -->
4350
<string name="smartspace_preferences">Preferences</string>
@@ -65,6 +72,7 @@
6572
<string name="layout">Layout</string>
6673
<!-- Generic styling options -->
6774
<string name="wallpaper">Wallpaper</string>
75+
<string name="style">Style</string>
6876
<string name="background_opacity">Background opacity</string>
6977
<!-- Toast text and tips -->
7078
<string name="copied_toast">Copied to clipboard</string>
@@ -75,9 +83,9 @@
7583
<string name="wallpapers">Wallpapers</string>
7684
<string name="caddy_beta">Caddy (Beta)</string>
7785
<string name="caddy">Caddy</string>
78-
<string name="app_drawer_folder">App drawer folder</string>
86+
<string name="app_drawer_folder">App drawer folders</string>
7987
<string name="app_drawer_folder_settings">Drawer folder</string>
80-
<string name="add_folder">Add folder</string>
88+
<string name="add_folder">Create folder</string>
8189
<string name="edit_folder">Edit folder</string>
8290
<string name="add_label">Add</string>
8391
<string name="edit_label">Edit</string>
@@ -86,11 +94,14 @@
8694
<string name="folder_list_note">Swipe left to edit, swipe right to delete, or tap to update items</string>
8795
<string name="apps_in_folder_label">Hide folder apps</string>
8896
<string name="apps_in_folder_description">Apps assigned to folders are excluded from app lists</string>
97+
<string name="folders_filter_duplicates">Only show unique apps</string>
8998
<string name="my_folder_label">My folder</string>
9099
<!-- A11y description -->
91-
<string name="accessibility_service_description">To lock your phone when performing a gesture, and to open Recents via gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
100+
<string name="accessibility_service_description">To perform certain actions (such as locking your phone) when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, or to open Recents, Lawnchair uses the performGlobalAction Accessibility service.</string>
101+
<string name="x_with_y_count">%1$s (%2$d)</string>
92102
<string name="x_by_y">%1$d x %2$d</string>
93103
<string name="x_and_y">%1$s &amp; %2$s</string>
104+
<string name="advanced">Advanced</string>
94105
<!--
95106
96107
Preference Dashboard
@@ -361,6 +372,8 @@
361372
<string name="gesture_swipe_down">Swipe down</string>
362373
<string name="gesture_home_tap">Home button</string>
363374
<string name="gesture_back_tap">Back button</string>
375+
<string name="gesture_swipe_left">Swipe left</string>
376+
<string name="gesture_swipe_right">Swipe right</string>
364377
<string name="gesture_handler_no_op">Do nothing</string>
365378
<string name="gesture_handler_sleep">Sleep</string>
366379
<string name="gesture_handler_recents">Open Recents</string>

0 commit comments

Comments
 (0)