diff options
| author | John Reck <jreck@google.com> | 2013-01-28 13:35:56 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2013-01-28 13:38:55 -0800 |
| commit | ca593b02ab6a3054f625878621ee5117953f7385 (patch) | |
| tree | 2e0e2cf14ad31b765f895438473f84b0157f0c24 /AndroidManifest.xml | |
| parent | c1bbc208d1bc3541ca7ae6816de244fe7cec865c (diff) | |
| download | android_packages_apps_Gallery2-ca593b02ab6a3054f625878621ee5117953f7385.tar.gz android_packages_apps_Gallery2-ca593b02ab6a3054f625878621ee5117953f7385.tar.bz2 android_packages_apps_Gallery2-ca593b02ab6a3054f625878621ee5117953f7385.zip | |
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7034aa967..360128ceb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -161,6 +161,9 @@ <data android:mimeType="vnd.android.cursor.dir/image" /> <data android:mimeType="vnd.android.cursor.dir/video" /> </intent-filter> + <meta-data + android:name="com.google.android.canvas.data.launcher_info" + android:resource="@xml/canvas_info" /> </activity> <!-- we add this activity-alias for shortcut backward compatibility --> @@ -387,5 +390,12 @@ android:theme="@style/Theme.ProxyLauncher"> </activity> <service android:name="com.android.gallery3d.app.BatchService" /> + <!-- canvas --> + <provider + android:name="com.android.gallery3d.provider.CanvasProvider" + android:authorities="com.android.gallery3d.provider.CanvasProvider" + android:exported="true" + android:label="@string/app_name" + android:permission="android.permission.ACCESS_APP_BROWSE_DATA" /> </application> </manifest> |