diff options
| author | Tony Wickham <twickham@google.com> | 2020-08-19 20:24:15 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2020-08-19 20:24:15 -0700 |
| commit | 1674880634a33d6e357aeea66a0fef58efdeac0f (patch) | |
| tree | 6edc3cd7ae5801578deb89f716b2ea18c8b1723d /AndroidManifest.xml | |
| parent | 012054e6c6f24157d4a4664acc4b5a30ead6318d (diff) | |
| parent | 28f0d31dc6fbaf4051a2a79690613073d1cf0c9a (diff) | |
| download | platform_packages_apps_WallpaperPicker2-1674880634a33d6e357aeea66a0fef58efdeac0f.tar.gz platform_packages_apps_WallpaperPicker2-1674880634a33d6e357aeea66a0fef58efdeac0f.tar.bz2 platform_packages_apps_WallpaperPicker2-1674880634a33d6e357aeea66a0fef58efdeac0f.zip | |
Merging from ub-launcher3-master @ build 6777814
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6777814.html
Change-Id: Ia78f542e03f7d0adb49f3c06021824cf624ce376
Diffstat (limited to 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 29250ad..3e10ce7 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,24 +52,33 @@ </intent-filter> </activity> - <activity-alias android:name="com.android.wallpaper.picker.CategoryPickerActivity" - android:targetActivity="com.android.wallpaper.picker.TopLevelPickerActivity" - android:label="@string/app_name"> + <activity android:name="com.android.wallpaper.picker.DeepLinkActivity" + android:theme="@style/WallpaperTheme.NoBackground"> + <intent-filter android:autoVerify="true"> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + <data + android:host="g.co" + android:pathPrefix="/wallpaper" + android:scheme="https" /> + </intent-filter> + </activity> + + <activity-alias + android:name="com.android.wallpaper.picker.CategoryPickerActivity" + android:targetActivity="com.android.wallpaper.picker.TopLevelPickerActivity" + android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> </activity-alias> <activity android:name="com.android.wallpaper.picker.individual.IndividualPickerActivity" - android:label="@string/app_name" - android:theme="@style/WallpaperTheme" - android:resizeableActivity="false" - android:parentActivityName="com.android.wallpaper.picker.TopLevelPickerActivity" - android:exported="true"> - <intent-filter> - <action android:name="com.android.wallpaper.picker.DEEP_LINK"/> - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> + android:label="@string/app_name" + android:theme="@style/WallpaperTheme" + android:resizeableActivity="false" + android:parentActivityName="com.android.wallpaper.picker.TopLevelPickerActivity"> </activity> <activity android:name="com.android.wallpaper.picker.PreviewActivity" |