diff options
author | Bobby Georgescu <georgescu@google.com> | 2012-12-26 00:52:28 -0800 |
---|---|---|
committer | Bobby Georgescu <georgescu@google.com> | 2013-01-07 14:43:56 -0800 |
commit | d3aac52ffb88ced53413d5eef29c641dd6982267 (patch) | |
tree | b5e614ec3f5cc1f29ee6b501c7cfa8ac0bfb0fce /AndroidManifest.xml | |
parent | 3114fa3a8a99be3c819d102dd1d069face13c43f (diff) | |
download | android_packages_apps_Gallery2-d3aac52ffb88ced53413d5eef29c641dd6982267.tar.gz android_packages_apps_Gallery2-d3aac52ffb88ced53413d5eef29c641dd6982267.tar.bz2 android_packages_apps_Gallery2-d3aac52ffb88ced53413d5eef29c641dd6982267.zip |
Replace camera importer
Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 10 |
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" |