Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1800d500 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Flag activities for bubbles shortcut" into main

parents 50b2dccf a4027030

libs/WindowManager/Shell/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ android_library { 
        "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

+2 −0
Original line number Diff line number Diff line
@@ -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" >