Merge AndroidManifest.xml/ from platform/packages/apps/Gallery2 to AndroidManifest.xml/
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..ef1d914
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest android:versionCode="40030"
+ android:versionName="1.1.40030"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.gallery3d">
+
+ <original-package android:name="com.android.gallery3d" />
+
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+
+ <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
+ android:protectionLevel="signatureOrSystem" />
+
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+ <uses-permission android:name="android.permission.NFC" />
+ <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.SET_WALLPAPER" />
+ <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+ <uses-permission android:name="android.permission.VIBRATE" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+ <uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
+
+ <supports-screens android:smallScreens="false"
+ android:normalScreens="true" android:largeScreens="true"
+ android:anyDensity="true" />
+
+ <application android:icon="@mipmap/ic_launcher_gallery" android:label="@string/app_name"
+ android:name="com.android.gallery3d.app.GalleryAppImpl"
+ android:theme="@style/Theme.Gallery"
+ android:logo="@mipmap/ic_launcher_gallery"
+ android:hardwareAccelerated="true"
+ android:largeHeap="true"
+ android:backupAgent="com.android.camera.CameraBackupAgent"
+ android:restoreAnyVersion="true">
+ <uses-library android:name="com.google.android.media.effects" android:required="false" />
+ <meta-data android:name="com.google.android.backup.api_key"
+ android:value="AEdPqrEAAAAIRIXquXawbz6duuuCIUAZ_YJv1zbFMMcjZ0NoVw" />
+ <activity android:name="com.android.gallery3d.app.MovieActivity"
+ android:label="@string/movie_view_label"
+ android:configChanges="orientation|keyboardHidden|screenSize">
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="rtsp" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:scheme="content" />
+ <data android:scheme="file" />
+ <data android:mimeType="video/mpeg4" />
+ <data android:mimeType="video/mp4" />
+ <data android:mimeType="video/3gp" />
+ <data android:mimeType="video/3gpp" />
+ <data android:mimeType="video/3gpp2" />
+ <data android:mimeType="video/webm" />
+ <data android:mimeType="video/avi" />
+ <data android:mimeType="application/sdp" />
+ </intent-filter>
+ <intent-filter>
+ <!-- HTTP live support -->
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:mimeType="audio/x-mpegurl" />
+ <data android:mimeType="audio/mpegurl" />
+ <data android:mimeType="application/vnd.apple.mpegurl" />
+ <data android:mimeType="application/x-mpegurl" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name"
+ android:configChanges="keyboardHidden|orientation|screenSize">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.APP_GALLERY" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.GET_CONTENT" />
+ <category android:name="android.intent.category.OPENABLE" />
+ <data android:mimeType="vnd.android.cursor.dir/image" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.GET_CONTENT" />
+ <category android:name="android.intent.category.OPENABLE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="image/*" />
+ <data android:mimeType="video/*" />
+ </intent-filter>
+ <!-- We do NOT support the PICK intent, we add these intent-filter for
+ backward compatibility. Handle it as GET_CONTENT. -->
+ <intent-filter>
+ <action android:name="android.intent.action.PICK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="image/*" />
+ <data android:mimeType="video/*" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.PICK" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="vnd.android.cursor.dir/image" />
+ <data android:mimeType="vnd.android.cursor.dir/video" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="vnd.android.cursor.dir/image" />
+ <data android:mimeType="vnd.android.cursor.dir/video" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <action android:name="com.android.camera.action.REVIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:scheme="content" />
+ <data android:scheme="file" />
+ <data android:mimeType="image/bmp" />
+ <data android:mimeType="image/jpeg" />
+ <data android:mimeType="image/gif" />
+ <data android:mimeType="image/png" />
+ <data android:mimeType="image/webp" />
+ <data android:mimeType="image/x-ms-bmp" />
+ <data android:mimeType="image/vnd.wap.wbmp" />
+ <data android:mimeType="application/vnd.google.panorama360+jpg" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="com.android.camera.action.REVIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:scheme="content" />
+ <data android:scheme="file" />
+ <data android:mimeType="video/mpeg4" />
+ <data android:mimeType="video/mp4" />
+ <data android:mimeType="video/3gp" />
+ <data android:mimeType="video/3gpp" />
+ <data android:mimeType="video/3gpp2" />
+ <data android:mimeType="application/sdp" />
+ </intent-filter>
+ </activity>
+
+ <!-- we add this activity-alias for shortcut backward compatibility -->
+ <!-- Note: The alias must put after the target activity -->
+ <activity-alias android:name="com.cooliris.media.Gallery"
+ android:targetActivity="com.android.gallery3d.app.Gallery"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity-alias>
+
+ <!-- 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:configChanges="orientation|screenSize"
+ 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"
+ android:theme="@style/android:Theme.Translucent.NoTitleBar">
+ <intent-filter android:label="@string/camera_setas_wallpaper">
+ <action android:name="android.intent.action.ATTACH_DATA" />
+ <data android:mimeType="image/*" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:label="@string/app_name">
+ <action android:name="android.intent.action.SET_WALLPAPER" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="android.wallpaper.preview"
+ android:resource="@xml/wallpaper_picker_preview" />
+ </activity>
+ <activity android:name="com.android.gallery3d.app.TrimVideo"
+ android:label="@string/trim_label">
+ </activity>
+
+ <permission android:name="com.android.gallery3d.filtershow.permission.READ"
+ android:protectionLevel="signature" />
+
+ <permission android:name="com.android.gallery3d.filtershow.permission.WRITE"
+ android:protectionLevel="signature" />
+
+ <provider
+ android:name="com.android.gallery3d.filtershow.provider.SharedImageProvider"
+ android:authorities="com.android.gallery3d.filtershow.provider.SharedImageProvider"
+ android:grantUriPermissions="true"
+ android:readPermission="com.android.gallery3d.filtershow.permission.READ"
+ android:writePermission="com.android.gallery3d.filtershow.permission.WRITE" />
+
+ <service
+ android:name=".filtershow.pipeline.ProcessingService"
+ android:exported="false" />
+
+ <activity
+ android:name="com.android.gallery3d.filtershow.FilterShowActivity"
+ android:label="@string/title_activity_filter_show"
+ android:theme="@style/Theme.FilterShow"
+ android:configChanges="keyboardHidden|orientation|screenSize">
+ <intent-filter>
+ <action android:name="android.intent.action.EDIT" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="image/*" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="action_nextgen_edit" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="image/*" />
+ </intent-filter>
+ </activity>
+
+ <activity
+ android:name="com.android.gallery3d.filtershow.crop.CropActivity"
+ android:label="@string/crop"
+ android:theme="@style/Theme.FilterShow"
+ android:configChanges="keyboardHidden|orientation|screenSize">
+ <intent-filter android:label="@string/crop_label">
+ <action android:name="com.android.camera.action.CROP" />
+ <data android:scheme="http" />
+ <data android:scheme="https" />
+ <data android:scheme="content" />
+ <data android:scheme="file" />
+ <data android:scheme="" />
+ <data android:mimeType="image/*" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.ALTERNATIVE" />
+ <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
+ </intent-filter>
+ </activity>
+
+ <uses-library android:name="com.google.android.media.effects"
+ android:required="false" />
+
+ <activity android:name="com.android.gallery3d.settings.GallerySettings"
+ android:theme="@style/Theme.Gallery"
+ android:configChanges="orientation|keyboardHidden|screenSize" />
+
+ <provider android:name="com.android.gallery3d.provider.GalleryProvider"
+ android:syncable="false"
+ android:grantUriPermissions="true"
+ android:exported="true"
+ android:permission="com.android.gallery3d.permission.GALLERY_PROVIDER"
+ android:authorities="com.android.gallery3d.provider" />
+ <provider
+ android:name="com.android.photos.data.PhotoProvider"
+ android:authorities="com.android.gallery3d.photoprovider"
+ android:syncable="false"
+ android:exported="false"/>
+ <activity android:name="com.android.gallery3d.gadget.WidgetClickHandler" />
+ <activity android:name="com.android.gallery3d.app.DialogPicker"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/DialogPickerTheme"/>
+ <activity android:name="com.android.gallery3d.app.AlbumPicker"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/DialogPickerTheme"/>
+ <activity android:name="com.android.gallery3d.gadget.WidgetTypeChooser"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/Theme.Gallery.Dialog"/>
+ <activity android:name="com.android.camera.CameraActivity"
+ android:taskAffinity="com.android.camera.CameraActivity"
+ android:label="@string/camera_label"
+ android:theme="@style/Theme.Camera"
+ android:icon="@mipmap/ic_launcher_camera"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:clearTaskOnLaunch="true"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+ <intent-filter>
+ <action android:name="android.media.action.IMAGE_CAPTURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.keyguard.layout"
+ android:resource="@layout/keyguard_widget" />
+ </activity>
+
+ <activity android:name="com.android.camera.SecureCameraActivity"
+ android:taskAffinity="com.android.camera.SecureCameraActivity"
+ android:excludeFromRecents="true"
+ android:label="@string/camera_label"
+ android:theme="@style/Theme.Camera"
+ android:icon="@mipmap/ic_launcher_camera"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:clearTaskOnLaunch="true"
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+ <intent-filter>
+ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.keyguard.layout"
+ android:resource="@layout/keyguard_widget" />
+ </activity>
+
+ <activity-alias android:icon="@mipmap/ic_launcher_camera"
+ android:label="@string/camera_label"
+ android:name="com.android.camera.CameraLauncher"
+ android:targetActivity="com.android.camera.CameraActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity-alias>
+
+ <activity-alias android:icon="@mipmap/ic_launcher_camera"
+ android:label="@string/camera_label"
+ android:name="com.android.camera.Camera"
+ android:targetActivity="com.android.camera.CameraActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity-alias>
+
+ <activity-alias android:icon="@mipmap/ic_launcher_video_camera"
+ android:label="@string/video_camera_label"
+ android:name="com.android.camera.VideoCamera"
+ android:targetActivity="com.android.camera.CameraActivity" >
+ <intent-filter>
+ <action android:name="android.media.action.VIDEO_CAMERA" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.VIDEO_CAPTURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity-alias>
+
+ <receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider"
+ android:label="@string/appwidget_title">
+ <intent-filter>
+ <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+ </intent-filter>
+ <meta-data android:name="android.appwidget.provider"
+ android:resource="@xml/widget_info" />
+ </receiver>
+ <receiver android:name="com.android.gallery3d.app.PackagesMonitor">
+ <intent-filter>
+ <action android:name="android.intent.action.PACKAGE_ADDED"/>
+ <action android:name="android.intent.action.PACKAGE_REMOVED"/>
+ <action android:name="android.intent.action.PACKAGE_CHANGED"/>
+ <data android:scheme="package"/>
+ </intent-filter>
+ </receiver>
+ <service android:name="com.android.gallery3d.app.PackagesMonitor$AsyncService"/>
+ <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
+ <intent-filter>
+ <action android:name="android.intent.action.CAMERA_BUTTON"/>
+ </intent-filter>
+ </receiver>
+ <receiver android:name="com.android.camera.DisableCameraReceiver">
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ </intent-filter>
+ </receiver>
+ <service android:name="com.android.gallery3d.gadget.WidgetService"
+ android:permission="android.permission.BIND_REMOTEVIEWS"/>
+ <activity android:name="com.android.gallery3d.gadget.WidgetConfigure"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/android:Theme.Translucent.NoTitleBar">
+ <intent-filter>
+ <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+ </intent-filter>
+ </activity>
+ <activity android:name="com.android.camera.ProxyLauncher"
+ android:theme="@style/Theme.ProxyLauncher">
+ </activity>
+ <service android:name="com.android.gallery3d.app.BatchService" />
+ <service android:name="com.android.camera.MediaSaveService" />
+ </application>
+</manifest>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
new file mode 100644
index 0000000..f44156e
--- /dev/null
+++ b/tests/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.gallery3d.tests">
+
+ <application
+ android:debuggable="true">
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Tests for GalleryNew3D application."/>
+
+ <instrumentation android:name="com.android.gallery3d.CameraTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Camera continuous test runner"/>
+
+ <instrumentation android:name="com.android.gallery3d.exif.ExifTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Tests for ExifParser."/>
+
+ <instrumentation android:name="com.android.gallery3d.jpegstream.JpegStreamTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Tests for JpegStream classes."/>
+
+ <instrumentation android:name="com.android.gallery3d.stress.CameraStressTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Camera stress test runner"/>
+
+ <instrumentation android:name="com.android.photos.data.DataTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Tests for android photo DataProviders."/>
+</manifest>
diff --git a/tests_camera/AndroidManifest.xml b/tests_camera/AndroidManifest.xml
new file mode 100644
index 0000000..164bbd5
--- /dev/null
+++ b/tests_camera/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.camera.tests">
+
+ <uses-permission android:name="android.permission.INJECT_EVENTS" />
+
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <instrumentation android:name="com.android.camera.CameraLaunchPerformance"
+ android:targetPackage="com.android.camera"
+ android:label="Camera Launch Performance">
+ </instrumentation>
+
+ <instrumentation android:name="com.android.camera.stress.CameraStressTestRunner"
+ android:targetPackage="com.android.camera"
+ android:label="Camera stress test runner">
+ </instrumentation>
+
+ <instrumentation android:name="com.android.camera.CameraTestRunner"
+ android:targetPackage="com.android.camera"
+ android:label="Camera continuous test runner">
+ </instrumentation>
+
+ <instrumentation android:name="android.test.InstrumentationTestRunner"
+ android:targetPackage="com.android.camera"
+ android:label="Tests for Camera application."/>
+</manifest>