From d78be769b9bc48a78d3220b9016344e9d794c114 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 5 Feb 2013 10:44:51 -0800
Subject: Cleanup

 Move Canvas to com.android.photos.canvas
 Remove workaround for b/8079561

Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
---
 AndroidManifest.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'AndroidManifest.xml')

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>
-- 
cgit v1.2.3