commit a4027030f30f971ef9cf1d98ff0bd4cd3f07e87a
author Ats Jenk <atsjenk@google.com> Fri Jun 14 13:03:25 2024 -0700
committer Ats Jenk <atsjenk@google.com> Wed Jul 17 22:49:34 2024 +0000
tree fb437a623756dc388c14a149feb1a9125c092a5f
parent 8f6695be63099ffe2ca83e44f4bfdf26dfde49b8

Flag activities for bubbles shortcut

Put activities behind a flag in the manifest.

Bug: 340337839
Flag: com.android.wm.shell.enable_retrievable_bubbles
Test: m droid
Change-Id: I8256e9daac8d0071173e44d52de499e2acd70211

libs/WindowManager/Shell/Android.bp

diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index e6cb3a0..5135e9e 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -239,6 +239,9 @@
         "wmshell.protolog.json.gz",
         "wmshell.protolog.pb",
     ],
+    flags_packages: [
+        "com_android_wm_shell_flags",
+    ],
     kotlincflags: ["-Xjvm-default=all"],
     manifest: "AndroidManifest.xml",
     plugins: ["dagger2-compiler"],

libs/WindowManager/Shell/AndroidManifest.xml

diff --git a/libs/WindowManager/Shell/AndroidManifest.xml b/libs/WindowManager/Shell/AndroidManifest.xml
index 52ae93f..bbbc23e 100644
--- a/libs/WindowManager/Shell/AndroidManifest.xml
+++ b/libs/WindowManager/Shell/AndroidManifest.xml
@@ -34,6 +34,7 @@
 
         <activity
             android:name=".bubbles.shortcut.CreateBubbleShortcutActivity"
+            android:featureFlag="com.android.wm.shell.enable_retrievable_bubbles"
             android:exported="true"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay"
@@ -47,6 +48,7 @@
 
         <activity
             android:name=".bubbles.shortcut.ShowBubblesActivity"
+            android:featureFlag="com.android.wm.shell.enable_retrievable_bubbles"
             android:exported="true"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay" >