Merge branch 'LawnchairLauncher:15-dev' into trunk

Goooler · Jan 12, 2025 · 62b4f4f · 62b4f4f
2 parents fe274db + 44b457a
commit 62b4f4f
Show file tree

Hide file tree

Showing 162 changed files with 2,968 additions and 1,282 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,8 +19,10 @@ ij_kotlin_name_count_to_use_star_import = 999
 ij_kotlin_name_count_to_use_star_import_for_members = 999
 ij_kotlin_packages_to_use_import_on_demand = unset
 ktlint_code_style = intellij_idea
-ktlint_standard_discouraged-comment-location = disabled
 ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_discouraged-comment-location = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_compose_lambda-param-event-trailing = disabled
 
 [*.md]
 trim_trailing_whitespace = false

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,9 @@ import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'com.android.application' version "8.7.3"
-    id 'com.android.library' version "8.7.3" apply false
-    id 'com.android.test' version '8.7.3' apply false
+    id 'com.android.application' version "8.8.0"
+    id 'com.android.library' version "8.8.0" apply false
+    id 'com.android.test' version '8.8.0' apply false
     id 'androidx.baselineprofile' version '1.3.3'
     id 'org.jetbrains.kotlin.android' version "2.1.0"
     id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0"
@@ -16,7 +16,7 @@ plugins {
     id 'app.cash.licensee' version "1.12.0"
     id 'dev.rikka.tools.refine' version "4.4.0"
     id 'org.gradle.android.cache-fix' version '3.0.1'
-    id 'com.diffplug.spotless' version '7.0.0'
+    id 'com.diffplug.spotless' version '7.0.1'
 }
 
 
@@ -42,7 +42,7 @@ allprojects {
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.29.2'
+        def protocVersion = '4.29.3'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -78,7 +78,7 @@ allprojects {
 
     ext {
         FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs"
-        daggerVersion = '2.54'
+        daggerVersion = '2.55'
 
         addFrameworkJar = { String name ->
             def frameworkJar = new File(FRAMEWORK_PREBUILTS_DIR, name)

diff --git a/hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.aidl b/hidden-api/src/main/java/com/android/internal/util/ScreenshotRequest.aidl
diff --git a/lawnchair/res/layout/wallpaper_options_popup.xml b/lawnchair/res/layout/wallpaper_options_popup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:id="@+id/popup_container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    class="app.lawnchair.ui.popup.LawnchairPopupDialog$LawnchairOptionsPopUp">
+    <LinearLayout
+        android:orientation="vertical"
+        android:id="@+id/wallpaper_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="2dp">
+        <app.lawnchair.ui.popup.WallpaperCarouselView
+            android:orientation="horizontal"
+            android:id="@+id/wallpaper_carousel"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/wallpaper_carousel_height"
+            android:layout_margin="@dimen/system_shortcut_margin_start"/>
+    </LinearLayout>
+</view>
diff --git a/lawnchair/res/layout/wallpaper_options_popup_item.xml b/lawnchair/res/layout/wallpaper_options_popup_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.shortcuts.DeepShortcutView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:theme="@style/PopupItem"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/bg_popup_item_height"
+    android:elevation="2dp">
+    <include layout="@layout/system_shortcut_content"/>
+</com.android.launcher3.shortcuts.DeepShortcutView>
diff --git a/lawnchair/res/values-af-rZA/strings.xml b/lawnchair/res/values-af-rZA/strings.xml
@@ -71,6 +71,7 @@
     <string name="item_removed">Item removed</string>
     <!-- Miscellaneous -->
     <string name="what_to_show">What to show</string>
+    <string name="wallpapers">Wallpapers</string>
     <!-- A11y description -->
     <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>
     <string name="x_by_y">%1$d x %2$d</string>
@@ -400,9 +401,9 @@
     <string name="show_material_u_popup_label">Use new pop-up style</string>
     <string name="show_material_u_popup_description">Use Material You\'s bouncy and slightly consolidated pop-up style</string>
     <string name="popup_menu">Pop-up menu</string>
-    <string name="home_screen_lock_toggle_from_home_popup">Show lock button</string>
-    <string name="show_system_settings_entry">Show system settings button</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show edit home screen button</string>
+    <string name="popup_menu_items">Pop-up menu items</string>
+    <string name="edit_menu_items">Edit pop-up menu items</string>
+    <string name="wallpaper_quick_picker">Wallpaper quick picker</string>
     <string name="status_bar_label">Status bar</string>
     <string name="show_status_bar">Show status bar</string>
     <string name="dark_status_bar_label">Dark status bar</string>
@@ -419,7 +420,9 @@
     <string name="widget_unlimited_size_description">Remove the minimum and maximum size restrictions of widgets</string>
     <!-- Dock settings -->
     <string name="show_hotseat_title">Show dock</string>
+    <string name="enable_dock_to_access_qsb_settings">Search bar settings are available when the Dock is visible. Tap to show the Dock.</string>
     <string name="search_bar_label">Search bar</string>
+    <string name="search_bar_settings">Search bar settings</string>
     <string name="hotseat_mode_label">Search bar widget</string>
     <string name="hotseat_mode_disabled">Disabled</string>
     <string name="hotseat_mode_google_search">Google Search bar</string>
@@ -430,10 +433,12 @@
     <string name="apply_accent_color_label">Apply accent color</string>
     <string name="search_provider">Search provider</string>
     <string name="hotseat_background">Show background</string>
-    <string name="hotseat_bg_horizontal_inset_left">Horizontal inset (Left)</string>
-    <string name="hotseat_bg_horizontal_inset_right">Horizontal inset (Right)</string>
-    <string name="hotseat_bg_vertical_inset_top">Vertical inset (Top)</string>
-    <string name="hotseat_bg_vertical_inset_bottom">Vertical inset (Bottom)</string>
+    <string name="hotseat_bg_horizontal_inset_left">Left margin</string>
+    <string name="hotseat_bg_horizontal_inset_right">Right margin</string>
+    <string name="hotseat_bg_vertical_inset_top">Top margin</string>
+    <string name="hotseat_bg_vertical_inset_bottom">Bottom margin</string>
+    <string name="hotseat_bg_color_label">Background color</string>
+    <string name="hotseat_bg_alpha">Background opacity</string>
     <!-- Pause apps shortcut -->
     <string name="pause">Pause</string>
     <string name="pause_apps_dialog_title">Pause %1$s?</string>
@@ -464,6 +469,7 @@
     <string name="app_drawer_columns">App drawer columns</string>
     <string name="row_height_label">Row height</string>
     <string name="app_drawer_indent_label">Horizontal padding</string>
+    <string name="app_drawer_bg_color_label">Background color</string>
     <!-- HiddenAppsPreferences -->
     <string name="hide_from_drawer">Hide from app drawer</string>
     <string name="hidden_apps_label_with_count">Hidden apps (%1$d)</string>

diff --git a/lawnchair/res/values-am-rET/strings.xml b/lawnchair/res/values-am-rET/strings.xml
@@ -71,6 +71,7 @@
     <string name="item_removed">Item removed</string>
     <!-- Miscellaneous -->
     <string name="what_to_show">What to show</string>
+    <string name="wallpapers">Wallpapers</string>
     <!-- A11y description -->
     <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>
     <string name="x_by_y">%1$d x %2$d</string>
@@ -400,9 +401,9 @@
     <string name="show_material_u_popup_label">Use new pop-up style</string>
     <string name="show_material_u_popup_description">Use Material You\'s bouncy and slightly consolidated pop-up style</string>
     <string name="popup_menu">Pop-up menu</string>
-    <string name="home_screen_lock_toggle_from_home_popup">Show lock button</string>
-    <string name="show_system_settings_entry">Show system settings button</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show edit home screen button</string>
+    <string name="popup_menu_items">Pop-up menu items</string>
+    <string name="edit_menu_items">Edit pop-up menu items</string>
+    <string name="wallpaper_quick_picker">Wallpaper quick picker</string>
     <string name="status_bar_label">Status bar</string>
     <string name="show_status_bar">Show status bar</string>
     <string name="dark_status_bar_label">Dark status bar</string>
@@ -419,7 +420,9 @@
     <string name="widget_unlimited_size_description">Remove the minimum and maximum size restrictions of widgets</string>
     <!-- Dock settings -->
     <string name="show_hotseat_title">Show dock</string>
+    <string name="enable_dock_to_access_qsb_settings">Search bar settings are available when the Dock is visible. Tap to show the Dock.</string>
     <string name="search_bar_label">Search bar</string>
+    <string name="search_bar_settings">Search bar settings</string>
     <string name="hotseat_mode_label">Search bar widget</string>
     <string name="hotseat_mode_disabled">Disabled</string>
     <string name="hotseat_mode_google_search">Google Search bar</string>
@@ -430,10 +433,12 @@
     <string name="apply_accent_color_label">Apply accent color</string>
     <string name="search_provider">Search provider</string>
     <string name="hotseat_background">Show background</string>
-    <string name="hotseat_bg_horizontal_inset_left">Horizontal inset (Left)</string>
-    <string name="hotseat_bg_horizontal_inset_right">Horizontal inset (Right)</string>
-    <string name="hotseat_bg_vertical_inset_top">Vertical inset (Top)</string>
-    <string name="hotseat_bg_vertical_inset_bottom">Vertical inset (Bottom)</string>
+    <string name="hotseat_bg_horizontal_inset_left">Left margin</string>
+    <string name="hotseat_bg_horizontal_inset_right">Right margin</string>
+    <string name="hotseat_bg_vertical_inset_top">Top margin</string>
+    <string name="hotseat_bg_vertical_inset_bottom">Bottom margin</string>
+    <string name="hotseat_bg_color_label">Background color</string>
+    <string name="hotseat_bg_alpha">Background opacity</string>
     <!-- Pause apps shortcut -->
     <string name="pause">Pause</string>
     <string name="pause_apps_dialog_title">Pause %1$s?</string>
@@ -464,6 +469,7 @@
     <string name="app_drawer_columns">App drawer columns</string>
     <string name="row_height_label">Row height</string>
     <string name="app_drawer_indent_label">Horizontal padding</string>
+    <string name="app_drawer_bg_color_label">Background color</string>
     <!-- HiddenAppsPreferences -->
     <string name="hide_from_drawer">Hide from app drawer</string>
     <string name="hidden_apps_label_with_count">Hidden apps (%1$d)</string>

diff --git a/lawnchair/res/values-ar-rSA/strings.xml b/lawnchair/res/values-ar-rSA/strings.xml
@@ -71,6 +71,7 @@
     <string name="item_removed">تم إزالة العنصر</string>
     <!-- Miscellaneous -->
     <string name="what_to_show">ماذا يُعرض</string>
+    <string name="wallpapers">Wallpapers</string>
     <!-- A11y description -->
     <string name="accessibility_service_description">لقفل هاتفك عند تنفيذ إيماءة، ولفتح التطبيقات الحديثة عبر الإيماءة، يحتاج Lawnchair إلى الوصول إلى خدمات الوصول. لا يراقب Lawnchair أي إجراء من المستخدم، على الرغم من أن هذه الصلاحية مطلوبة لجميع خدمات الوصول. يتجاهل Lawnchair أي حدث يتم إرساله من النظام. لقفل هاتفك، أو لفتح التطبيقات الحديثة، يستخدم Lawnchair خدمة الوصول performGlobalAction.</string>
     <string name="x_by_y">%1$d x %2$d</string>
@@ -400,9 +401,9 @@
     <string name="show_material_u_popup_label">استخدام نمط النافذة المنبثقة الجديد</string>
     <string name="show_material_u_popup_description">استخدام نمط النافذة المنبثقة النابض والمجدد في Material You</string>
     <string name="popup_menu">القائمة المنبثقة</string>
-    <string name="home_screen_lock_toggle_from_home_popup">إظهار زر القفل</string>
-    <string name="show_system_settings_entry">إظهار زر إعدادات النظام</string>
-    <string name="home_screen_edit_toggle_from_home_popup">إظهار زر تعديل الشاشة الرئيسية</string>
+    <string name="popup_menu_items">Pop-up menu items</string>
+    <string name="edit_menu_items">Edit pop-up menu items</string>
+    <string name="wallpaper_quick_picker">Wallpaper quick picker</string>
     <string name="status_bar_label">شريط الحالة</string>
     <string name="show_status_bar">إظهار شريط الحالة</string>
     <string name="dark_status_bar_label">شريط الحالة الداكن</string>
@@ -419,7 +420,9 @@
     <string name="widget_unlimited_size_description">إزالة قيود الحد الأدنى والحد الأقصى لحجم التطبيقات المصغرة</string>
     <!-- Dock settings -->
     <string name="show_hotseat_title">إظهار شريط Dock</string>
+    <string name="enable_dock_to_access_qsb_settings">Search bar settings are available when the Dock is visible. Tap to show the Dock.</string>
     <string name="search_bar_label">شريط البحث</string>
+    <string name="search_bar_settings">Search bar settings</string>
     <string name="hotseat_mode_label">أداة شريط البحث</string>
     <string name="hotseat_mode_disabled">معطل</string>
     <string name="hotseat_mode_google_search">شريط بحث Google</string>
@@ -430,10 +433,12 @@
     <string name="apply_accent_color_label">تطبيق لون التمييز</string>
     <string name="search_provider">مزود البحث</string>
     <string name="hotseat_background">أظهر الخلفية</string>
-    <string name="hotseat_bg_horizontal_inset_left">المساحة البينية الأفقية (جهة اليسار)</string>
-    <string name="hotseat_bg_horizontal_inset_right">المساحة البينية الأفقية (جهة اليمين)</string>
-    <string name="hotseat_bg_vertical_inset_top">المساحة البينية العمودية (جهة الأعلى)</string>
-    <string name="hotseat_bg_vertical_inset_bottom">المساحة البينية العمودية (جهة الأسفل)</string>
+    <string name="hotseat_bg_horizontal_inset_left">Left margin</string>
+    <string name="hotseat_bg_horizontal_inset_right">Right margin</string>
+    <string name="hotseat_bg_vertical_inset_top">Top margin</string>
+    <string name="hotseat_bg_vertical_inset_bottom">Bottom margin</string>
+    <string name="hotseat_bg_color_label">Background color</string>
+    <string name="hotseat_bg_alpha">شفافية الخلفية</string>
     <!-- Pause apps shortcut -->
     <string name="pause">Pause</string>
     <string name="pause_apps_dialog_title">Pause %1$s?</string>
@@ -464,6 +469,7 @@
     <string name="app_drawer_columns">أعمدة درج التطبيقات</string>
     <string name="row_height_label">ارتفاع الصف</string>
     <string name="app_drawer_indent_label">التوسيع الأفقي</string>
+    <string name="app_drawer_bg_color_label">Background color</string>
     <!-- HiddenAppsPreferences -->
     <string name="hide_from_drawer">إخفاء من درج التطبيقات</string>
     <string name="hidden_apps_label_with_count">التطبيقات المخفية (%1$d)</string>

diff --git a/lawnchair/res/values-az-rAZ/strings.xml b/lawnchair/res/values-az-rAZ/strings.xml
@@ -71,6 +71,7 @@
     <string name="item_removed">Item removed</string>
     <!-- Miscellaneous -->
     <string name="what_to_show">What to show</string>
+    <string name="wallpapers">Wallpapers</string>
     <!-- A11y description -->
     <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>
     <string name="x_by_y">%1$d x %2$d</string>
@@ -400,9 +401,9 @@
     <string name="show_material_u_popup_label">Use new pop-up style</string>
     <string name="show_material_u_popup_description">Use Material You\'s bouncy and slightly consolidated pop-up style</string>
     <string name="popup_menu">Pop-up menu</string>
-    <string name="home_screen_lock_toggle_from_home_popup">Show lock button</string>
-    <string name="show_system_settings_entry">Show system settings button</string>
-    <string name="home_screen_edit_toggle_from_home_popup">Show edit home screen button</string>
+    <string name="popup_menu_items">Pop-up menu items</string>
+    <string name="edit_menu_items">Edit pop-up menu items</string>
+    <string name="wallpaper_quick_picker">Wallpaper quick picker</string>
     <string name="status_bar_label">Status bar</string>
     <string name="show_status_bar">Show status bar</string>
     <string name="dark_status_bar_label">Dark status bar</string>
@@ -419,7 +420,9 @@
     <string name="widget_unlimited_size_description">Remove the minimum and maximum size restrictions of widgets</string>
     <!-- Dock settings -->
     <string name="show_hotseat_title">Show dock</string>
+    <string name="enable_dock_to_access_qsb_settings">Search bar settings are available when the Dock is visible. Tap to show the Dock.</string>
     <string name="search_bar_label">Search bar</string>
+    <string name="search_bar_settings">Search bar settings</string>
     <string name="hotseat_mode_label">Search bar widget</string>
     <string name="hotseat_mode_disabled">Disabled</string>
     <string name="hotseat_mode_google_search">Google Search bar</string>
@@ -430,10 +433,12 @@
     <string name="apply_accent_color_label">Apply accent color</string>
     <string name="search_provider">Search provider</string>
     <string name="hotseat_background">Show background</string>
-    <string name="hotseat_bg_horizontal_inset_left">Horizontal inset (Left)</string>
-    <string name="hotseat_bg_horizontal_inset_right">Horizontal inset (Right)</string>
-    <string name="hotseat_bg_vertical_inset_top">Vertical inset (Top)</string>
-    <string name="hotseat_bg_vertical_inset_bottom">Vertical inset (Bottom)</string>
+    <string name="hotseat_bg_horizontal_inset_left">Left margin</string>
+    <string name="hotseat_bg_horizontal_inset_right">Right margin</string>
+    <string name="hotseat_bg_vertical_inset_top">Top margin</string>
+    <string name="hotseat_bg_vertical_inset_bottom">Bottom margin</string>
+    <string name="hotseat_bg_color_label">Background color</string>
+    <string name="hotseat_bg_alpha">Background opacity</string>
     <!-- Pause apps shortcut -->
     <string name="pause">Pause</string>
     <string name="pause_apps_dialog_title">Pause %1$s?</string>
@@ -464,6 +469,7 @@
     <string name="app_drawer_columns">App drawer columns</string>
     <string name="row_height_label">Row height</string>
     <string name="app_drawer_indent_label">Horizontal padding</string>
+    <string name="app_drawer_bg_color_label">Background color</string>
     <!-- HiddenAppsPreferences -->
     <string name="hide_from_drawer">Hide from app drawer</string>
     <string name="hidden_apps_label_with_count">Hidden apps (%1$d)</string>