summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChing-Sung Li <chriscsli@google.com>2022-04-18 03:04:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-18 03:04:01 +0000
commit25d017c02322860d4c7a54d033421f8d77d8fef8 (patch)
tree0dc8a439f1298d847c7403c134530c73c3a7d272
parentae401d3231122770721c4285b774b60375820016 (diff)
parent72bb9517ef1e958445342543eb498f302602ed4b (diff)
downloadThemePicker-25d017c02322860d4c7a54d033421f8d77d8fef8.tar.gz
Merge "Revise manifest for adding trampoline activity" into tm-dev
-rwxr-xr-xAndroidManifest.xml19
1 files changed, 18 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6e79a91..ff8f187d 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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>