commit 9e3fbf1611105d603799c369871383da43df14c5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 16 12:23:01 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 16 12:23:01 2024 +0000
tree 26b8b9a1c583a3a7513f01d452e1d6fea4f1aa41
parent 41f4546aaed9f4fbeb91e439dd3834dc345d3402
parent 03aa04d45b35f8df58ec3b2dc7e6fcac4c4592b5

Merge "Revert "Adds new log constant to track overview select tooltip misalignment"" into main

aconfig/Android.bp

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index bca7494..5413601 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@
 aconfig_declarations {
     name: "com_android_launcher3_flags",
     package: "com.android.launcher3",
-    container: "system_ext",
+    container: "system",
     srcs: ["**/*.aconfig"],
 }
 

aconfig/launcher.aconfig

diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 3769124..f877fd8 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system_ext"
+container: "system"
 
 flag {
     name: "enable_expanding_pause_work_button"

aconfig/launcher_overview.aconfig

diff --git a/aconfig/launcher_overview.aconfig b/aconfig/launcher_overview.aconfig
index 23733a4..853faf8 100644
--- a/aconfig/launcher_overview.aconfig
+++ b/aconfig/launcher_overview.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system_ext"
+container: "system"
 
 flag {
     name: "enable_grid_only_overview"

aconfig/launcher_search.aconfig

diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig
index b98eee6..72f654e 100644
--- a/aconfig/launcher_search.aconfig
+++ b/aconfig/launcher_search.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system_ext"
+container: "system"
 
 flag {
     name: "enable_private_space"

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
index 2e456a7..2858929 100644
--- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
+++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java
@@ -248,7 +248,6 @@
     }
 
     @Test
-    @ScreenRecordRule.ScreenRecord // b/355042336
     public void testOverview() throws IOException {
         startAppFast(getAppPackageName());
         startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));