mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'campaigns'

Browse source 
Conflicts:
	commons/res/values/strings.xml
	commons/src/main/java/org/wikimedia/commons/Media.java

Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
This commit is contained in:
YuviPanda 2013-10-15 22:54:03 +05:30
commit 064dbb0df6
32 changed files with 1374 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

27
commons/AndroidManifest.xml
View file

@ -82,6 +82,15 @@
android:label="@string/title_activity_settings"
/>
<activity android:name=".AboutActivity" android:label="@string/title_activity_about"/>
<activity android:name=".campaigns.CampaignActivity" android:label="Campaigns"
android:icon="@drawable/ic_launcher"
>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<service android:name=".upload.UploadService" >
</service>
<service
@ -96,6 +105,17 @@
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
</service>
<service
android:name=".campaigns.CampaignsSyncService"
android:exported="true">
<intent-filter>
<action
android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/campaigns_sync_adapter" />
</service>
<service
android:name=".contributions.ContributionsSyncService"
android:exported="true">
@ -127,6 +147,13 @@
android:authorities="org.wikimedia.commons.contributions.contentprovider"
android:exported="false">
</provider>
<provider
android:name=".campaigns.CampaignsContentProvider"
android:label="@string/provider_campaigns"
android:syncable="true"
android:authorities="org.wikimedia.commons.campaigns.contentprovider"
android:exported="false">
</provider>
<provider
android:name=".modifications.ModificationsContentProvider"
android:label="@string/provider_modifications"