summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-02-20 17:01:54 -0800
committerGeorge Mount <mount@google.com>2013-02-26 12:49:13 -0800
commitb2b1e6cbf4a090215bc903762782e2c6961de61a (patch)
treea5f09eb680b53c2a9d629fab6815fe94f5521050
parent40eee8e4ae94b1ed8d0832812e03a14af0a46802 (diff)
downloadandroid_packages_apps_Snap-b2b1e6cbf4a090215bc903762782e2c6961de61a.tar.gz
android_packages_apps_Snap-b2b1e6cbf4a090215bc903762782e2c6961de61a.tar.bz2
android_packages_apps_Snap-b2b1e6cbf4a090215bc903762782e2c6961de61a.zip
Add initial implementation of PhotosProvider.
Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
-rw-r--r--AndroidManifest.xml5
-rw-r--r--tests/AndroidManifest.xml4
2 files changed, 9 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3cd30cbac..1a6f800f2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -254,6 +254,11 @@
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"
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index ef63cc414..b98b5e0b8 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -36,4 +36,8 @@
<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>