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 | d61434151ca06924a8a0dbac0217fe8ce7101c47 (patch) | |
tree | eb79e9c2b0ee883c378d6cbf9de6bd2827b70db8 | |
parent | eee54dd1b93b69cb01fc77f9a2676eecec9bea5d (diff) | |
download | android_packages_apps_Snap-d61434151ca06924a8a0dbac0217fe8ce7101c47.tar.gz android_packages_apps_Snap-d61434151ca06924a8a0dbac0217fe8ce7101c47.tar.bz2 android_packages_apps_Snap-d61434151ca06924a8a0dbac0217fe8ce7101c47.zip |
Code drop
Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
-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> |