Voltageos mergeable

Android.bp

@@ -17,7 +17,7 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-min_launcher3_sdk_version = "31"
+min_launcher3_sdk_version = "36"
 
 // Targets that don't inherit framework aconfig libs (i.e., those that don't set
 // `platform_apis: true`) must manually link them.
@@ -449,6 +449,7 @@ android_library {
         "launcher-dagger-qualifiers",
         "launcher-executor-qualifiers",
         "launcher-executors-module",
+        "SettingsLib",
     ],
     manifest: "AndroidManifest-common.xml",
     sdk_version: "current",
@@ -496,8 +497,12 @@ android_app {
     overrides: [
         "Home",
         "Launcher2",
+        "QuickSearchBox",
+    ],
+    required: [
+        "privapp_whitelist_com.android.launcher3",
+        "privapp_whitelist_com.android.launcher3-ext",
     ],
-    required: ["privapp_whitelist_com.android.launcher3"],
 
     jacoco: {
         include_filter: ["com.android.launcher3.**"],
@@ -642,9 +647,11 @@ android_app {
         "Home",
         "Launcher2",
         "Launcher3",
+        "QuickSearchBox",
     ],
     required: [
         "privapp_whitelist_com.android.launcher3",
+        "privapp_whitelist_com.android.launcher3-ext",
         "launcher.quickstep.protolog.pb",
     ],
 
@@ -687,8 +694,12 @@ android_app {
         "Launcher2",
         "Launcher3",
         "Launcher3QuickStep",
+        "QuickSearchBox",
+    ],
+    required: [
+        "privapp_whitelist_com.android.launcher3",
+        "privapp_whitelist_com.android.launcher3-ext",
     ],
-    required: ["privapp_whitelist_com.android.launcher3"],
 
     additional_manifests: [
         "go/AndroidManifest.xml",
@@ -724,8 +735,12 @@ android_app {
         "Launcher2",
         "Launcher3",
         "Launcher3QuickStep",
+        "QuickSearchBox",
+    ],
+    required: [
+        "privapp_whitelist_com.android.launcher3",
+        "privapp_whitelist_com.android.launcher3-ext",
     ],
-    required: ["privapp_whitelist_com.android.launcher3"],
 
     additional_manifests: [
         "go/AndroidManifest.xml",
@@ -738,3 +753,11 @@ android_app {
         include_filter: ["com.android.launcher3.*"],
     },
 }
+
+prebuilt_etc {
+    name: "privapp_whitelist_com.android.launcher3-ext",
+    system_ext_specific: true,
+    sub_dir: "permissions",
+    src: "privapp_whitelist_com.android.launcher3-ext.xml",
+    filename_from_src: true,
+}

AndroidManifest-common.xml

@@ -45,6 +45,7 @@
     <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.DEVICE_POWER" />
 
     <permission
         android:name="${applicationId}.permission.GRID_CONTROL"

AndroidManifest.xml

@@ -72,6 +72,9 @@
             <meta-data
                 android:name="com.android.launcher3.grid.control"
                 android:value="${packageName}.grid_control" />
+            <meta-data
+                android:name="com.android.launcher3.themedicon.option"
+                android:value="${packageName}.grid_control" />
         </activity>
 
         <activity android:name="com.android.launcher3.widgetpicker.WidgetPickerActivity"

go/AndroidManifest-launcher.xml

@@ -66,6 +66,9 @@
             <meta-data
                 android:name="com.android.launcher3.grid.control"
                 android:value="${packageName}.grid_control" />
+            <meta-data
+                android:name="com.android.launcher3.themedicon.option"
+                android:value="${packageName}.grid_control" />
         </activity>
 
     </application>

go/quickstep/res/xml/default_workspace_4x4.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+
+    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+    <!-- Dialer, Messaging, Browser, Camera -->
+    <resolve
+        launcher:container="-101"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" />
+        <favorite launcher:uri="tel:123" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" />
+        <favorite launcher:uri="sms:" />
+        <favorite launcher:uri="smsto:" />
+        <favorite launcher:uri="mms:" />
+        <favorite launcher:uri="mmsto:" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="2"
+        launcher:x="2"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />
+    </resolve>
+
+    <resolve
+         launcher:container="-101"
+         launcher:screen="3"
+         launcher:x="3"
+         launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" />
+        <favorite launcher:uri="http://www.example.com/" />
+    </resolve>
+
+    <resolve
+        launcher:container="-101"
+        launcher:screen="4"
+        launcher:x="4"
+        launcher:y="0" >
+        <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" />
+        <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" />
+    </resolve>
+
+    <!-- Screen 0 -->
+
+    <!-- Google folder -->
+    <!-- Google Go, Gmail Go, Assistant Go, Maps Go, YouTube, Duo, Gallery Go -->
+    <folder
+        launcher:title="@string/google_folder_title"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="3">
+        <favorite
+            launcher:packageName="com.google.android.apps.searchlite"
+            launcher:className="com.google.android.apps.searchlite.ui.SearchActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.gm"
+            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.assistant"
+            launcher:className="com.google.android.apps.assistant.go.MainActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.mapslite"
+            launcher:className="org.chromium.webapk.shell_apk.MainActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.youtube"
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.tachyon"
+            launcher:className="com.google.android.apps.tachyon.MainActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.photosgo"
+            launcher:className="com.google.android.apps.photosgo.home.HomeActivity"/>
+    </folder>
+
+    <favorite
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="3"
+        launcher:packageName="com.android.vending"
+        launcher:className="com.android.vending.AssetBrowserActivity"/>
+
+    <!-- Screen 1 -->
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="-1" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" />
+        <favorite launcher:uri="mailto:" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="-1" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />
+        <favorite launcher:uri="#Intent;type=images/*;end" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="org.lineageos.eleven"
+        launcher:className="org.lineageos.eleven.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="-1" />
+
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="-1" />
+
+</favorites>

res/color-night-v31/folder_preview_dark.xml → privapp_whitelist_com.android.launcher3-ext.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
+<!--
+     Copyright (C) 2019-2025 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.
@@ -13,8 +14,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:color="@android:color/system_neutral1_900"
-        android:lStar="12" />
-</selector>
+<permissions>
+    <!-- Additional permissions on top of privapp_whitelist_com.android.launcher3.xml -->
+    <privapp-permissions package="com.android.launcher3">
+        <permission name="android.permission.SUSPEND_APPS"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    </privapp-permissions>
+</permissions>

res/color-night-v31/folder_background_dark.xml → quickstep/res/drawable/ic_clear_all.xml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
+<!-- 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.
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:color="@android:color/system_neutral2_900"
-        android:lStar="12" />
-</selector>
+<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="#000000" android:pathData="M5,13H19V11H5M3,17H17V15H3M7,7V9H21V7" />
+</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/overview_actions_container.xml

@@ -45,6 +45,13 @@
             android:text="@string/action_split"
             android:visibility="gone" />
 
+        <Button
+            android:id="@+id/action_clear_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_clear_all"
+            android:text="@string/recents_clear_all" />
+
     </LinearLayout>
 
     <!-- Currently, the only "group action button" is this save app pair button. If more are added,
@@ -57,4 +64,4 @@
         android:layout_gravity="bottom|center_horizontal"
         android:visibility="gone" />
 
-</com.android.quickstep.views.OverviewActionsView>
+</com.android.quickstep.views.OverviewActionsView>

quickstep/res/values/dimens.xml

@@ -16,7 +16,7 @@
 
 <resources>
     <!-- For screens without rounded corners -->
-    <dimen name="task_corner_radius_small">2dp</dimen>
+    <dimen name="task_corner_radius_small">16dp</dimen>
     <!-- For Launchers that want to override the default dialog corner radius -->
     <dimen name="task_corner_radius_override">-1dp</dimen>