summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-12-26 00:52:28 -0800
committerBobby Georgescu <georgescu@google.com>2013-01-07 14:43:56 -0800
commitacdb67533db178cb6a87faf6f2bda2ec646ce0af (patch)
tree82d6ab8b43d5cdb150ca7515e89f57ac99e04afd /AndroidManifest.xml
parent388da787acca0999a0a706ddd3778128ba255a22 (diff)
downloadandroid_packages_apps_Snap-acdb67533db178cb6a87faf6f2bda2ec646ce0af.tar.gz
android_packages_apps_Snap-acdb67533db178cb6a87faf6f2bda2ec646ce0af.tar.bz2
android_packages_apps_Snap-acdb67533db178cb6a87faf6f2bda2ec646ce0af.zip
Replace camera importer
Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml10
1 files changed, 6 insertions, 4 deletions
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"