commit 24898d3be057125be162b41781630bc51be276a3
author Greg Kaiser <gkaiser@google.com> Fri Nov 05 16:18:33 2021 +0000
committer Alex Chau <alexchau@google.com> Fri Nov 05 16:19:05 2021 +0000
tree 5da081ef78c602c83a4505ebd3cf6e719bda5988
parent 10eb3cd98b91bea37b1659ab82245b88e5ee67ba

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

This reverts commit 10eb3cd98b91bea37b1659ab82245b88e5ee67ba.

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

Change-Id: I3605c01066a3ce383d45e0a938f1e00b3c7f7bb9
Merged-In: I5ee18d3ee1b671fcaedda633e7a268addd5c5c15

Android.bp

diff --git a/Android.bp b/Android.bp
index f79c186..d04dca0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -258,8 +258,8 @@
         "go/quickstep/res",
     ],
     static_libs: [
-        "QuickstepResLib",
         "Launcher3CommonDepsLib",
+        "QuickstepResLib",
     ],
     manifest: "quickstep/AndroidManifest-launcher.xml",
     additional_manifests: [
@@ -278,15 +278,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,