New Crowdin updates

Android.bp

@@ -458,6 +458,8 @@ android_library {
         "launcher-executors-module",
         "libGoogleFeed",
         "SettingsLib",
+        "org.lineageos.platform",
+        "chaldea.seraphixgoogle",
     ],
     manifest: "AndroidManifest-common.xml",
     sdk_version: "current",
@@ -482,6 +484,8 @@ android_app {
 
     static_libs: [
         "Launcher3ResLib",
+        "androidx.room_room-runtime",
+        "androidx.room_room-ktx",
     ],
     srcs: [
         ":launcher-src",
@@ -498,7 +502,10 @@ android_app {
     sdk_version: "current",
     min_sdk_version: min_launcher3_sdk_version,
     target_sdk_version: "current",
-    plugins: ["dagger2-compiler"],
+    plugins: [
+        "androidx.room_room-compiler-plugin",
+        "dagger2-compiler",
+    ],
     certificate: "platform",
     privileged: true,
     system_ext_specific: true,
@@ -582,6 +589,7 @@ android_library {
     static_libs: [
         "QuickstepResLib",
         "androidx.room_room-runtime",
+        "androidx.room_room-ktx",
     ],
     plugins: [
         "androidx.room_room-compiler-plugin",
@@ -624,10 +632,15 @@ android_library {
     static_libs: [
         "SystemUI-statsd",
         "QuickstepResLib",
+        "androidx.room_room-runtime",
+        "androidx.room_room-ktx",
     ],
     manifest: "quickstep/AndroidManifest.xml",
     platform_apis: true,
-    plugins: ["dagger2-compiler"],
+    plugins: [
+        "androidx.room_room-compiler-plugin",
+        "dagger2-compiler",
+    ],
     min_sdk_version: "current",
     // TODO(b/319712088): re-enable use_resource_processor
     use_resource_processor: false,

AndroidManifest-common.xml

@@ -47,6 +47,25 @@
     <uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
     <uses-permission android:name="android.permission.WAKEUP_SURFACE_FLINGER" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.ACCESS_CONTEXTUAL_SEARCH" />
+    <uses-permission android:name="android.permission.INJECT_EVENTS" />
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
+    <uses-permission android:name="android.permission.QUERY_USERS" />
+    <uses-permission android:name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
+    <uses-permission android:name="org.omnirom.omnijaws.READ_WEATHER" />
+    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+
+    <!-- AppLock -->
+    <uses-permission android:name="android.permission.MANAGE_APP_LOCK" />
+
+    <!-- Floating window -->
+    <uses-permission android:name="com.libremobileos.permission.START_FREEFORM" />
 
     <permission
         android:name="${applicationId}.permission.GRID_CONTROL"
@@ -187,6 +206,14 @@
             android:exported="true"
             android:autoRemoveFromRecents="true" />
 
+        <!-- Icon Pack -->
+        <activity
+            android:name="com.android.launcher3.icons.pack.IconPackSettingsActivity"
+            android:label="@string/icon_pack_title"
+            android:theme="@style/HomeSettings.Theme"
+            android:exported="true"
+            android:autoRemoveFromRecents="true"  />
+
         <provider
             android:name="com.android.launcher3.testing.TestInformationProvider"
             android:authorities="${applicationId}.TestInfo"
@@ -220,5 +247,12 @@
         <property
             android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"
             android:value="true" />
+
+        <activity
+            android:name="com.android.launcher3.lineage.trust.TrustAppsActivity"
+            android:label="@string/trust_apps_manager_name"
+            android:permission="android.permission.MANAGE_APP_LOCK"
+            android:theme="@style/Theme.SubSettingsBase.Expressive"
+            android:autoRemoveFromRecents="true" />
     </application>
 </manifest>

crowdin.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /res/values/cr_strings.xml
+    translation: /res/values-%android_code%/%original_file_name%

go/quickstep/src/com/android/launcher3/BuildConfig.java

@@ -24,7 +24,7 @@ public final class BuildConfig {
      * Flag to state if the QSB is on the first screen and placed on the top,
      * this can be overwritten in other launchers with a different value, if needed.
      */
-    public static final boolean QSB_ON_FIRST_SCREEN = true;
+    public static final boolean USE_QUICKSPACE_VIEW = true;
 
     /**
      * Flag to control various developer centric features

privapp_whitelist_com.android.launcher3-ext.xml

@@ -19,5 +19,15 @@
     <privapp-permissions package="com.android.launcher3">
         <permission name="android.permission.SUSPEND_APPS"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.ACCESS_CONTEXTUAL_SEARCH"/>
+        <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+        <permission name="android.permission.MANAGE_APP_LOCK"/>
+        <permission name="android.permission.QUERY_USERS"/>
+        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.GET_INTENT_SENDER_INTENT"/>
+        <permission name="com.android.alarm.permission.SET_ALARM"/>
+        <permission name="com.libremobileos.permission.START_FREEFORM"/>
     </privapp-permissions>
 </permissions>

proguard.flags

@@ -51,4 +51,16 @@
 # Don't warn about those in case this app is linking against an older
 # platform version.  We know about them, and they are safe.
 -dontwarn android.support.**
--dontwarn org.apache.http.**
+-dontwarn org.apache.http.**
+
+-keep class com.android.launcher3.lineage.trust.** {
+  *;
+}
+
+-keep class com.android.launcher3.icons.** {
+  *;
+}
+
+-keep class com.android.launcher3.data.** {
+  *;
+}

quickstep/res/drawable/ic_clear_all.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FF000000" android:pathData="M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7" />
+</vector>

quickstep/res/drawable/ic_kill_app.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="path"
+        android:pathData="M 4.707 3.293 L 3.293 4.707 L 10.586 12 L 3.293 19.293 L 4.707 20.707 L 12 13.414 L 19.293 20.707 L 20.707 19.293 L 13.414 12 L 20.707 4.707 L 19.293 3.293 L 12 10.586 L 4.707 3.293 Z"
+        android:fillColor="#ff000000"
+        android:strokeWidth="1"/>
+</vector>

quickstep/res/drawable/ic_lens.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff000000" android:pathData="M8.4445,5.7778C6.9689,5.7778 5.7778,6.9689 5.7778,8.4445L5.7778,10.2222L4,10.2222L4,8.4445C4,5.9911 5.9911,4 8.4445,4L10.2222,4v1.7778zM17.3333,17.3333m-1.7778,0a1.7778,1.7778 0,1 1,3.5555 0,1.7778 1.7778,0 1,1 -3.5555,0M12,12m-3.1111,0a3.1111,3.1111 0,1 1,6.2222 0,3.1111 3.1111,0 1,1 -6.2222,0M8.4444,18.2222c-1.4755,0 -2.6667,-1.1911 -2.6667,-2.6667L5.7777,13.7778L4,13.7778v1.7778C4,18.0089 5.9911,20 8.4445,20L10.2222,20L10.2222,18.2222ZM15.5555,5.7778c1.4755,0 2.6667,1.1911 2.6667,2.6667L18.2222,10.2222L20,10.2222L20,8.4445C20,5.9911 18.0089,4 15.5555,4h-1.7778v1.7778z" />
+</vector>

quickstep/res/drawable/ic_screenshot.xml

@@ -12,21 +12,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M5.8334,1.666H8.3334V3.3327H5.8334V6.666H4.1667V3.3327C4.1667,2.4122 4.9129,1.666 5.8334,1.666Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M4.1667,13.3327V16.666C4.1667,17.5865 4.9129,18.3327 5.8334,18.3327H8.3334V16.666H5.8334V13.3327H4.1667Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M14.1667,13.3327V16.666H11.6667V18.3327H14.1667C15.0872,18.3327 15.8334,17.5865 15.8334,16.666V13.3327H14.1667Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M15.8334,6.666V3.3327C15.8334,2.4122 15.0872,1.666 14.1667,1.666H11.6667V3.3327H14.1667V6.666H15.8334Z"
-      android:fillColor="#000000"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="20dp" android:width="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:fillColor="#000000" android:pathData="M5.8334,1.666H8.3334V3.3327H5.8334V6.666H4.1667V3.3327C4.1667,2.4122 4.9129,1.666 5.8334,1.666Z"/>
+    <path android:fillColor="#000000" android:pathData="M4.1667,13.3327V16.666C4.1667,17.5865 4.9129,18.3327 5.8334,18.3327H8.3334V16.666H5.8334V13.3327H4.1667Z"/>
+    <path android:fillColor="#000000" android:pathData="M14.1667,13.3327V16.666H11.6667V18.3327H14.1667C15.0872,18.3327 15.8334,17.5865 15.8334,16.666V13.3327H14.1667Z"/>
+    <path android:fillColor="#000000" android:pathData="M15.8334,6.666V3.3327C15.8334,2.4122 15.0872,1.666 14.1667,1.666H11.6667V3.3327H14.1667V6.666H15.8334Z"/>
+</vector>

quickstep/res/drawable/task_menu_item_bg.xml

@@ -15,7 +15,12 @@
      limitations under the License.
 -->
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/menu_item_hover_state_color" />
-    <corners android:radius="@dimen/task_menu_item_corner_radius" />
-</shape>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+     android:color="?android:attr/colorControlHighlight">
+     <item>
+          <shape>
+              <solid android:color="@color/menu_item_hover_state_color" />
+              <corners android:radius="@dimen/task_menu_item_corner_radius" />
+          </shape>
+     </item>
+</ripple>

quickstep/res/layout/fallback_recents_activity.xml

@@ -52,5 +52,8 @@
             android:id="@+id/overview_actions_view"
             layout="@layout/overview_actions_container" />
 
+        <include
+            layout="@layout/meminfo" />
+
     </com.android.quickstep.fallback.RecentsDragLayer>
 </com.android.launcher3.LauncherRootView>

quickstep/res/layout/meminfo.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.quickstep.views.MemInfoView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/meminfo"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="@color/overview_button"
+    android:textSize="12sp"
+    android:visibility="gone"/>

quickstep/res/layout/overview_actions_container.xml

@@ -34,17 +34,37 @@
             android:id="@+id/action_screenshot"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="6dp"
             android:drawableStart="@drawable/ic_screenshot"
-            android:text="@string/action_screenshot" />
+            android:text="@string/recents_screenshot_title"
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/action_split"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/overview_actions_button_spacing"
+            android:layout_marginHorizontal="6dp"
             android:text="@string/action_split"
             android:visibility="gone" />
 
+        <Button
+            android:id="@+id/action_lens"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="6dp"
+            android:drawableStart="@drawable/ic_lens"
+            android:text="@string/recents_lens_title"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/action_clear_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="6dp"
+            android:drawableStart="@drawable/ic_clear_all"
+            android:text="@string/recents_clear_all_title"
+            android:visibility="gone" />
+
     </LinearLayout>
 
     <!-- Currently, the only "group action button" is this save app pair button. If more are added,
@@ -57,4 +77,4 @@
         android:layout_gravity="bottom|center_horizontal"
         android:visibility="gone" />
 
-</com.android.quickstep.views.OverviewActionsView>
+</com.android.quickstep.views.OverviewActionsView>

quickstep/res/layout/overview_panel.xml

@@ -29,4 +29,7 @@
         android:id="@+id/overview_actions_view"
         layout="@layout/overview_actions_container" />
 
+    <include
+        layout="@layout/meminfo" />
+
 </merge>

quickstep/res/values/cr_dimens.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016-2026 crDroid Android 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Additional gesture navbar lengths -->
+    <dimen name="taskbar_stashed_small_screen_short">72dp</dimen>
+    <dimen name="taskbar_stashed_small_screen_long">140dp</dimen>
+    <dimen name="taskbar_stashed_handle_width_short">108dp</dimen>
+    <dimen name="taskbar_stashed_handle_width_long">300dp</dimen>
+    <dimen name="bubblebar_stashed_handle_width_short">35dp</dimen>
+    <dimen name="bubblebar_stashed_handle_width_long">75dp</dimen>
+
+    <!-- Additional gesture navbar heights -->
+    <dimen name="taskbar_stashed_handle_height_smallest">1dp</dimen>
+    <dimen name="taskbar_stashed_handle_height_smaller">2dp</dimen>
+    <dimen name="taskbar_stashed_handle_height_small">3dp</dimen>
+    <dimen name="taskbar_stashed_handle_height_tall">5dp</dimen>
+</resources>

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

@@ -396,7 +396,9 @@ public void run() {
         IRemoteCallback endCallback = completeRunnableListCallback(onEndCallback, mLauncher);
         options.setOnAnimationAbortListener(endCallback);
         options.setOnAnimationFinishedListener(endCallback);
-        options.setLaunchCookie(StableViewInfo.toLaunchCookie(itemInfo));
+        if (itemInfo != null) {
+            options.setLaunchCookie(StableViewInfo.toLaunchCookie(itemInfo));
+        }
 
         // Prepare taskbar for animation synchronization. This needs to happen here before any
         // app transition is created.
@@ -1430,6 +1432,7 @@ protected void unregisterRemoteTransitions() {
             mMoveDisplayTransition = null;
         }
         if (mBackAnimationController != null) {
+            mBackAnimationController.cleanupForDestroy();
             mBackAnimationController.unregisterBackCallbacks();
             mBackAnimationController.unregisterComponentCallbacks();
             mBackAnimationController = null;