Merge remote-tracking branch 'origin/upstream' into trunk

// Conflicts:
//	.github/workflows/ci.yml

build.gradle

@@ -3,15 +3,15 @@ import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'com.android.application' version "8.7.2"
-    id 'com.android.library' version "8.7.2" apply false
-    id 'com.android.test' version '8.7.2' apply false
+    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 'androidx.baselineprofile' version '1.3.3'
-    id 'org.jetbrains.kotlin.android' version "2.0.21"
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21"
-    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.21"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.21"
-    id "com.google.devtools.ksp" version "2.0.21-1.0.28"
+    id 'org.jetbrains.kotlin.android' version "2.1.0"
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0"
+    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.1.0"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "2.1.0"
+    id "com.google.devtools.ksp" version "2.1.0-1.0.29"
     id 'com.google.protobuf' version "0.9.4"
     id 'app.cash.licensee' version "1.12.0"
     id 'dev.rikka.tools.refine' version "4.4.0"
@@ -42,7 +42,7 @@ allprojects {
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.28.3'
+        def protocVersion = '4.29.0'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -78,7 +78,7 @@ allprojects {
 
     ext {
         FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs"
-        daggerVersion = '2.52'
+        daggerVersion = '2.53'
 
         addFrameworkJar = { String name ->
             def frameworkJar = new File(FRAMEWORK_PREBUILTS_DIR, name)
@@ -103,7 +103,6 @@ allprojects {
                 compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-core.jar')
                 compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd.jar')
                 compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-15.jar')
-//                compileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'QuickstepResLib.jar')
 
                 compileOnly projects.compatLib
                 compileOnly projects.compatLib.compatLibVQ
@@ -130,7 +129,7 @@ final def majorVersion = parts[0]
 final def versionInt = parts[0].toInteger() * 1000000 + parts[1].toInteger() * 10000 + parts[2].toInteger() * 100
 
 final def quickstepMinSdk = "29"
-final def quickstepMaxSdk = "34"
+final def quickstepMaxSdk = "35"
 
 android {
     namespace "com.android.launcher3"
@@ -311,14 +310,14 @@ dependencies {
 
     // Recents lib dependency
     withQuickstepCompileOnly projects.hiddenApi
-    withQuickstepImplementation projects.systemUIShared
-    withQuickstepImplementation projects.systemUIAnim
-    withQuickstepImplementation projects.systemUnFold
-    withQuickstepImplementation projects.systemUIViewCapture
-    withQuickstepImplementation projects.systemUILog
-    withQuickstepCompileOnly projects.systemUIPlugin
-    withQuickstepImplementation projects.systemUIPluginCore
-    withQuickstepCompileOnly projects.systemUICommon
+    withQuickstepImplementation projects.shared
+    withQuickstepImplementation projects.anim
+    withQuickstepImplementation projects.unfold
+    withQuickstepImplementation projects.viewcapture
+    withQuickstepImplementation projects.log
+    withQuickstepCompileOnly projects.plugin
+    withQuickstepImplementation projects.plugincore
+    withQuickstepCompileOnly projects.common
 
     // QuickSwitch Compat
     withQuickstepImplementation projects.compatLib
@@ -330,7 +329,6 @@ dependencies {
     withQuickstepImplementation projects.compatLib.compatLibVV
     withQuickstepImplementation projects.wmshell
     withQuickstepImplementation projects.flags
-//    withQuickstepImplementation projects.androidxLib
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
 
     implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'SystemUI-statsd-15.jar')
@@ -396,7 +394,7 @@ dependencies {
     // Persian Date
     implementation 'com.github.samanzamani:PersianDate:1.7.1'
 
-    implementation 'com.airbnb.android:lottie:6.6.0'
+    implementation 'com.airbnb.android:lottie:6.6.1'
 
     // Compose drag and drop library
     implementation 'sh.calvin.reorderable:reorderable:2.4.0'

flags/src/com/android/launcher3/FeatureFlagsImpl.java

@@ -109,7 +109,7 @@ private void load_overrides_launcher() {
             enableSmartspaceRemovalToggle =
                     properties.getBoolean(Flags.FLAG_ENABLE_SMARTSPACE_REMOVAL_TOGGLE, false);
             enableSupportForArchiving =
-                    properties.getBoolean(Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, false);
+                    properties.getBoolean(Flags.FLAG_ENABLE_SUPPORT_FOR_ARCHIVING, true);
             enableTabletTwoPanePickerV2 =
                     properties.getBoolean(Flags.FLAG_ENABLE_TABLET_TWO_PANE_PICKER_V2, false);
             enableTaskbarCustomization =

flags/src/com/android/window/flags/CustomFeatureFlags.java → flags/src/com/android/window/flags2/CustomFeatureFlags.java

@@ -1,4 +1,4 @@
-package com.android.window.flags;
+package com.android.window.flags2;
 
 // TODO(b/303773055): Remove the annotation after access issue is resolved.
 import java.util.Arrays;

flags/src/com/android/window/flags/FakeFeatureFlagsImpl.java → flags/src/com/android/window/flags2/FakeFeatureFlagsImpl.java

@@ -1,4 +1,4 @@
-package com.android.window.flags;
+package com.android.window.flags2;
 
 import java.util.HashMap;
 import java.util.Map;

flags/src/com/android/window/flags/FeatureFlags.java → flags/src/com/android/window/flags2/FeatureFlags.java

@@ -1,4 +1,4 @@
-package com.android.window.flags;
+package com.android.window.flags2;
 // TODO(b/303773055): Remove the annotation after access issue is resolved.
 /** @hide */
 public interface FeatureFlags {

flags/src/com/android/window/flags/FeatureFlagsImpl.java → flags/src/com/android/window/flags2/FeatureFlagsImpl.java

@@ -1,4 +1,4 @@
-package com.android.window.flags;
+package com.android.window.flags2;
 // TODO(b/303773055): Remove the annotation after access issue is resolved.
 
 import com.android.quickstep.util.DeviceConfigHelper;

flags/src/com/android/window/flags/Flags.java → flags/src/com/android/window/flags2/Flags.java

@@ -1,4 +1,4 @@
-package com.android.window.flags;
+package com.android.window.flags2;
 // TODO(b/303773055): Remove the annotation after access issue is resolved.
 /** @hide */
 public final class Flags {

lawnchair/res/color-v29/taskbar_background.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Make sure to align any changes to
+     frameworks/base/libs/WindowManager/Shell/res/color/taskbar_background_dark.xml -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@android:color/transparent" />
+</selector>

lawnchair/res/values-fr-rFR/strings.xml

@@ -33,7 +33,7 @@
     <string name="action_customize">Personnaliser</string>
     <string name="always_choice">Toujours</string>
     <string name="never_choice">Jamais</string>
-    <string name="clipboard">Presse-papier</string>
+    <string name="clipboard">Presse-papiers</string>
     <string name="action_copy_link">Copier le lien</string>
     <string name="action_copy">Copier</string>
     <string name="action_paste">Coller</string>

lawnchair/res/values-ja-rJP/strings.xml

@@ -31,8 +31,8 @@
     <string name="action_lock">ロックする</string>
     <string name="action_apply">適用</string>
     <string name="action_customize">カスタマイズ</string>
-    <string name="always_choice">常に許可</string>
-    <string name="never_choice">常に拒否</string>
+    <string name="always_choice">常に表示する</string>
+    <string name="never_choice">表示しない</string>
     <string name="clipboard">クリップボード</string>
     <string name="action_copy_link">リンクをコピー</string>
     <string name="action_copy">コピー</string>
@@ -379,20 +379,20 @@
     <string name="wallpaper_blur">ぼやけた壁紙（実験的な機能）</string>
     <string name="wallpaper_background_blur">Blur intensity</string>
     <string name="wallpaper_background_blur_factor">Factor threshold</string>
-    <string name="auto_add_shortcuts_label">Add new apps to home screen</string>
+    <string name="auto_add_shortcuts_label">ホーム画面に新しいアプリを追加</string>
     <string name="minus_one_enable">フィードを表示</string>
-    <string name="minus_one_unavailable">No feed apps installed</string>
+    <string name="minus_one_unavailable">フィードアプリがインストールされていません</string>
     <string name="minus_one">フィード</string>
     <string name="feed_provider">フィードのプロバイダー</string>
     <string name="wallpaper_scrolling_label">壁紙をスクロール</string>
-    <string name="wallpaper_depth_effect_label">Wallpaper depth effect</string>
+    <string name="wallpaper_depth_effect_label">壁紙の深度エフェクト</string>
     <string name="wallpaper_depth_effect_description">ランチャーのエリアを移動する際に背景がズームイン・ズームアウトします</string>
     <string name="show_sys_ui_scrim">上部の影</string>
     <string name="home_screen_grid">ホーム画面のグリッド</string>
     <string name="home_screen_lock">ホーム画面をロック</string>
     <string name="home_screen_unlock">ホーム画面のロックを解除</string>
     <string name="home_screen_locked">ホーム画面はロックされています</string>
-    <string name="home_screen_lock_description">Prevent changes to the home screen layout</string>
+    <string name="home_screen_lock_description">ホーム画面のレイアウトを固定する</string>
     <string name="show_dot_pagination_label">Show dot pagination</string>
     <string name="show_dot_pagination_description">Use dots instead of lines to show page number</string>
     <string name="show_material_u_popup_label">新しいポップアップスタイルを使用する</string>
@@ -407,9 +407,9 @@
     <string name="home_screen_text_color">テキストの色</string>
     <string name="color_light">ライト</string>
     <string name="color_dark">ダーク</string>
-    <string name="force_rounded_widgets">Rounded corners</string>
-    <string name="allow_widget_overlap">Allow overlap</string>
-    <string name="force_widget_resize_label">Enforce widget resizing</string>
+    <string name="force_rounded_widgets">角を丸くする</string>
+    <string name="allow_widget_overlap">重ねて表示することを許可</string>
+    <string name="force_widget_resize_label">ウィジェットのサイズをを強制的に変更する</string>
     <string name="force_widget_resize_description">Allow resizing of widgets that are constrained to a specific size</string>
     <string name="widget_unlimited_size_label">Remove size constraints</string>
     <string name="widget_unlimited_size_description">Remove the minimum and maximum size restrictions of widgets</string>
@@ -504,7 +504,7 @@
     <string name="perform_wide_search_title">デバイスを探す</string>
     <string name="perform_wide_search_description">Search your phone contacts, files, and settings</string>
     <string name="show_hidden_apps_in_search_results">検索結果に非表示のアプリを表示する</string>
-    <string name="hidden_apps_show_name_typed">If full name is typed</string>
+    <string name="hidden_apps_show_name_typed">完全一致で表示する</string>
     <string name="app_search_algorithm">検索のアルゴリズム</string>
     <string name="search_algorithm_app_search">アプリ検索</string>
     <string name="search_algorithm_global_search_on_device">グローバル検索 (デバイス上)</string>

lawnchair/res/values-sq-rAL/strings.xml

@@ -23,27 +23,27 @@
     -->
     <string name="preview_label">Parashikim</string>
     <string name="action_create">Krijo</string>
-    <string name="action_backup">Backup</string>
+    <string name="action_backup">Kopjoni</string>
     <string name="action_restore">Rikthe</string>
     <string name="action_delete">Fshij</string>
     <string name="action_reset">Rivendos</string>
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
+    <string name="action_unlock">Zhblloko</string>
+    <string name="action_lock">Blloko</string>
     <string name="action_apply">Vendos</string>
     <string name="action_customize">Personalizo</string>
-    <string name="always_choice">Always</string>
-    <string name="never_choice">Never</string>
+    <string name="always_choice">Gjithnjë</string>
+    <string name="never_choice">Asnjëherë</string>
     <string name="clipboard">Tabelë</string>
-    <string name="action_copy_link">Copy link</string>
+    <string name="action_copy_link">Kopjoni linkun</string>
     <string name="action_copy">Kopjo</string>
     <string name="action_paste">Ngjit</string>
     <string name="loading">Po ngarkohet…</string>
     <string name="managed_by_lawnchair">Menaxhuar nga Lawnchair</string>
     <!-- When mentioning settings UI -->
     <string name="smartspace_preferences">Preferencat</string>
-    <string name="settings_button_text">Home settings</string>
-    <string name="system_settings">System settings</string>
-    <string name="title_change_settings">Change settings</string>
+    <string name="settings_button_text">Konfigurimet e shtëpisë</string>
+    <string name="system_settings">Konfigurimet e sistemit</string>
+    <string name="title_change_settings">Ndrysho konfigurimet</string>
     <!--
 
     General "words" used throughout Lawnchair
@@ -53,7 +53,7 @@
     <string name="dynamic">Dinamike</string>
     <string name="presets">Parapërcaktime</string>
     <string name="custom">E veqantë</string>
-    <string name="feed_default">Default</string>
+    <string name="feed_default">E përcaktuar</string>
     <string name="system">Sistemi</string>
     <!-- Relating to the Launcher ui -->
     <string name="columns">Kolonat</string>
@@ -64,49 +64,49 @@
     <string name="layout">Plan</string>
     <!-- Generic styling options -->
     <string name="wallpaper">Sfondi</string>
-    <string name="background_opacity">Background opacity</string>
+    <string name="background_opacity">Tejdukshmëria e sfondit</string>
     <!-- Toast text and tips -->
-    <string name="copied_toast">Copied to clipboard</string>
-    <string name="item_removed">Item removed</string>
+    <string name="copied_toast">Kopjoni</string>
+    <string name="item_removed">Artikulli i hequr</string>
     <!-- Miscellaneous -->
-    <string name="what_to_show">What to show</string>
+    <string name="what_to_show">Çfarë të shfaqet</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>
-    <string name="x_and_y">%1$s &amp; %2$s</string>
+    <string name="accessibility_service_description">Që te kyçësh telefonin tuaj me një lëvizje apo gjest, apo të hapësh gjërat e fundit me një lëvizje apo gjest, Lawnchair-it i duhet mundësia e përdorimit (Accessability access).\n\nLawnchair nuk shikon veprimet që i kryen përdoruesi, por privilegji për ta bërë atë është i domosdoshëm. Lawnchair i fshin të gjitha aksionet që vijnë nga sistemi. \n\nPër ta kyçur telefonin tuaj, ose për të hapur gjërat e fundit, Lawnchair përdor mundësinë e përdorimit performGlobalAction.</string>
+    <string name="x_by_y">%1$d × %2$d</string>
+    <string name="x_and_y">%1$s&amp;%2$s</string>
     <!--
 
     Preference Dashboard
 
     -->
     <string name="settings">Cilësimet</string>
     <string name="general_label">Të përgjithshme</string>
-    <string name="general_description">Colors, icon packs, notification dots</string>
-    <string name="home_screen_label">Home screen</string>
-    <string name="home_screen_description">Feed, grid, icons</string>
+    <string name="general_description">Ngjyrat, Paketa e Ikonave, Pikat e njoftimeve</string>
+    <string name="home_screen_label">Ekrani Kryesorë</string>
+    <string name="home_screen_description">Lajmet, Rrjeta, Ikonat</string>
     <string name="dock_label">Dock-u</string>
-    <string name="dock_description">Search bar, icon count</string>
-    <string name="app_drawer_label">App drawer</string>
-    <string name="app_drawer_description">Hidden apps, column count, icons</string>
-    <string name="drawer_search_label">Drawer search</string>
-    <string name="drawer_search_description">Web suggestions, global search</string>
+    <string name="dock_description">Shiriti i kërkimit, numri i ikonave</string>
+    <string name="app_drawer_label">Dollapi i aplikacioneve</string>
+    <string name="app_drawer_description">Aplikacionet e fshehura, numri i kolonave, ikonat</string>
+    <string name="drawer_search_label">Shiriti i kërkimit te dollapit</string>
+    <string name="drawer_search_description">Sygjerime nga Web-i, Kërkimi global</string>
     <string name="folders_label">Dosjet</string>
-    <string name="folders_description">Row and column count</string>
+    <string name="folders_description">Numri i rreshtave dhe i kolonave</string>
     <string name="gestures_label">Gjestet</string>
-    <string name="gestures_description">Taps and swipes</string>
+    <string name="gestures_description">Prekje dhe rrëshqitje</string>
     <string name="quickstep_label">Të fundit</string>
-    <string name="quickstep_description">Clear All button, corner radius</string>
+    <string name="quickstep_description">Butoni për të fshirë gjithqka, rrezja e këndeve</string>
     <string name="about_label">Rreth</string>
-    <string name="app_info_drop_target_label">App info</string>
+    <string name="app_info_drop_target_label">Informacion për aplikacion</string>
     <string name="debug_restart_launcher">Rifillo Lawnchair</string>
-    <string name="experimental_features_label">Experimental features</string>
+    <string name="experimental_features_label">Veçoritë eksperimentale</string>
     <!-- Experimental features -->
-    <string name="font_picker_label">Font customization</string>
-    <string name="font_picker_description">Some text remains unchanged</string>
+    <string name="font_picker_label">Personalizo shkronjat</string>
+    <string name="font_picker_description">Disa tekst mbeten i pandryshuar</string>
     <string name="smartspace_calendar_label">At a Glance calendar customization</string>
-    <string name="smartspace_calendar_description">Allow showing date in non-Gregorian calendar systems</string>
-    <string name="workspace_increase_max_grid_size_label">Increase maximum grid size limit</string>
-    <string name="workspace_increase_max_grid_size_description">Increase maximum allowed home screen grid size from 10 x 10 to 20 x 20</string>
+    <string name="smartspace_calendar_description">Lejo të shfaqen datat ne sistemin e kalendarëve jogregorian</string>
+    <string name="workspace_increase_max_grid_size_label">Rrit limitin maksimal të madhësisë së rrjetës</string>
+    <string name="workspace_increase_max_grid_size_description">Rrite maksimumin e rrjetës qe lejohet të ekranit kryesorë nga 10 x 10 në 20 x 20</string>
     <string name="always_reload_icons_label">Always reload icons</string>
     <string name="always_reload_icons_description">Shmang përdorimin e ikonave të ruajtura nga paketat e ikonave</string>
     <string name="recents_lock_unlock">Lock/unlock</string>