diff options
| author | John Reck <jreck@google.com> | 2013-02-05 21:18:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-05 21:18:14 +0000 |
| commit | 008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35 (patch) | |
| tree | 7852937d70f7ff7df442529c5473cacc4f57db92 /AndroidManifest.xml | |
| parent | 247560770ac07eee9a09a5d9b857d0780873996f (diff) | |
| parent | d78be769b9bc48a78d3220b9016344e9d794c114 (diff) | |
| download | android_packages_apps_Gallery2-008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35.tar.gz android_packages_apps_Gallery2-008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35.tar.bz2 android_packages_apps_Gallery2-008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35.zip | |
Merge "Cleanup" into gb-ub-photos-bryce
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d4972832c..e36f1a4bb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -161,9 +161,6 @@ <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 --> @@ -391,12 +388,29 @@ </activity> <service android:name="com.android.gallery3d.app.BatchService" /> <service android:name="com.android.camera.MediaSaveService" /> + <!-- canvas --> <provider - android:name="com.android.gallery3d.provider.CanvasProvider" + android:name="com.android.photos.canvas.CanvasProvider" android:authorities="com.android.gallery3d.provider.CanvasProvider" android:exported="true" android:label="@string/app_name" android:permission="android.permission.ACCESS_APP_BROWSE_DATA" /> + <activity android:name="com.android.photos.canvas.EnableSyncActivity" + android:exported="true" + android:theme="@style/Theme.ProxyLauncher"> + </activity> + <activity android:name="com.android.photos.canvas.CanvasActivity" + android:label="@string/app_name" + android:exported="true" + android:theme="@style/Theme.ProxyLauncher"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="com.google.android.canvas.category.BROWSE_LAUNCHER" /> + </intent-filter> + <meta-data + android:name="com.google.android.canvas.data.launcher_info" + android:resource="@xml/canvas_info" /> + </activity> </application> </manifest> |