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

Commit 77470363 authored by Ching-Sung Li's avatar Ching-Sung Li Committed by Automerger Merge Worker
Browse files

Merge "Revise manifest for adding trampoline activity" into tm-dev am: 25d017c0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/17742610



Change-Id: Iad0d77adf778ccc1c03871e557729e67daed37b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9ba53eb 25d017c0

AndroidManifest.xml

+18 −1
Original line number Diff line number Diff line
@@ -57,9 +57,26 @@ 
            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.PassThroughCustomizationPickerActivity"

            android:label="@string/app_name"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.TrampolinePickerActivity"

            android:label="@string/app_name"

            android:relinquishTaskIdentity="true"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity-alias

            android:name="com.android.customization.picker.CustomizationPickerActivity"

            android:targetActivity="com.android.wallpaper.picker.CustomizationPickerActivity"

            android:targetActivity="com.android.wallpaper.picker.TrampolinePickerActivity"

            android:label="@string/app_name"

            android:exported="true">

             <intent-filter>