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

Commit de6e8248 authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Android (Google) Code Review
Browse files

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

parents 831cd1ca 6ee4093d

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)  -->