diff options
| author | John Reck <jreck@google.com> | 2013-02-05 10:44:51 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2013-02-05 12:35:06 -0800 |
| commit | c5e5dea2d474b05f837f86ce7eb330e9a9e40bbc (patch) | |
| tree | f36a6efe7223a5cf6da1b615b1cb41b76f72cd3e /AndroidManifest.xml | |
| parent | 41d9351e0a5c4ccbc1bad5e714bc88e0495f4440 (diff) | |
| download | android_packages_apps_Snap-c5e5dea2d474b05f837f86ce7eb330e9a9e40bbc.tar.gz android_packages_apps_Snap-c5e5dea2d474b05f837f86ce7eb330e9a9e40bbc.tar.bz2 android_packages_apps_Snap-c5e5dea2d474b05f837f86ce7eb330e9a9e40bbc.zip | |
Cleanup
Move Canvas to com.android.photos.canvas
Remove workaround for b/8079561
Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
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> |