From acdb67533db178cb6a87faf6f2bda2ec646ce0af Mon Sep 17 00:00:00 2001
From: Bobby Georgescu <georgescu@google.com>
Date: Wed, 26 Dec 2012 00:52:28 -0800
Subject: Replace camera importer

Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
---
 AndroidManifest.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f2dac1256..f5415a00c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -173,16 +173,18 @@
             </intent-filter>
         </activity-alias>
 
-        <!-- This activity receives USB_DEVICE_ATTACHED Intents and springboards to main Gallery activity. -->
-        <activity android:name="com.android.gallery3d.app.UsbDeviceActivity" android:label="@string/app_name"
-                android:taskAffinity=""
-                android:launchMode="singleInstance">
+         <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
+         media from attached MTP devices, like cameras and camera phones -->
+        <activity android:launchMode="singleInstance"
+            android:taskAffinity="" android:name="com.android.gallery3d.ingest.IngestActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>
             <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />
         </activity>
+        <service android:name="com.android.gallery3d.ingest.IngestService" />
 
         <activity android:name="com.android.gallery3d.app.Wallpaper"
                 android:configChanges="keyboardHidden|orientation|screenSize"
-- 
cgit v1.2.3