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

Commit 98f78a94 authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Automerger Merge Worker
Browse files

Merge "Update package for app clips activity." into udc-dev am: de6e8248 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21958122



Change-Id: I8501f2582cb0c8ed9899a24438ad4a9c76deac92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents baaf8eb6 de6e8248

packages/SystemUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ 
                 android:permission="com.android.systemui.permission.SELF"

                 android:exported="false" />



        <activity android:name=".screenshot.AppClipsTrampolineActivity"

        <activity android:name=".screenshot.appclips.AppClipsTrampolineActivity"

            android:theme="@style/AppClipsTrampolineActivity"

            android:label="@string/screenshot_preview_description"

            android:permission="android.permission.LAUNCH_CAPTURE_CONTENT_ACTIVITY_FOR_NOTE"
@@ -432,7 +432,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".screenshot.AppClipsActivity"

        <activity android:name=".screenshot.appclips.AppClipsActivity"

            android:theme="@style/AppClipsActivity"

            android:process=":appclips.screenshot"

            android:label="@string/screenshot_preview_description"

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ 
         and finally letting user send the screenshot to the calling notes app. This activity

         should not send the screenshot to the calling activity without user consent. -->

    <string name="config_screenshotAppClipsActivityComponent" translatable="false"

            >com.android.systemui/com.android.systemui.screenshot.AppClipsActivity</string>

            >com.android.systemui/com.android.systemui.screenshot.appclips.AppClipsActivity</string>



    <!-- Remote copy default activity.  Must handle REMOTE_COPY_ACTION intents.

     This name is in the ComponentName flattened format (package/class)  -->