commit 6f220d92b6c4c5b345fed5b6f1f61185832fb5c7
author Greg Kaiser <gkaiser@google.com> Fri Nov 05 16:12:47 2021 +0000
committer Greg Kaiser <gkaiser@google.com> Fri Nov 05 16:12:47 2021 +0000
tree b66baaed9701c53d87b449148b29ad0b58d36520
parent 238f630001d73120cd7c00721344802dc9bcf381

Revert "launcher: use a different task menu for foldables"

This reverts commit 238f630001d73120cd7c00721344802dc9bcf381.

Reason for revert: Root cause of P0 b/205278434
Bug: 205278434
Test: Local reverted and now launcher works on wembley

Change-Id: I5ee18d3ee1b671fcaedda633e7a268addd5c5c15

Android.bp

diff --git a/Android.bp b/Android.bp
index bab02b8..ac7e136 100644
--- a/Android.bp
+++ b/Android.bp
@@ -258,9 +258,9 @@
         "go/quickstep/res",
     ],
     static_libs: [
+        "Launcher3CommonDepsLib",
         "QuickstepResLib",
         "androidx.room_room-runtime",
-        "Launcher3CommonDepsLib",
     ],
     plugins: ["androidx.room_room-compiler-plugin"],
     manifest: "quickstep/AndroidManifest-launcher.xml",
@@ -280,15 +280,16 @@
     srcs: [
         ":launcher-src-no-build-config",
     ],
-    resource_dirs: [],
+    resource_dirs: [
+        "quickstep/res",
+    ],
     libs: [
         "framework-statsd",
     ],
     static_libs: [
-        "QuickstepResLib",
         "SystemUI-statsd",
         "SystemUISharedLib",
-        "Launcher3CommonDepsLib",
+        "Launcher3CommonDepsLib"
     ],
     manifest: "quickstep/AndroidManifest.xml",
     platform_apis: true,