Merge branch 'downloadmanager' into develop

This commit is contained in:
daniel oeh
2012-08-18 00:53:09 +02:00
23 changed files with 890 additions and 522 deletions

View File

@ -11,8 +11,6 @@
<uses-sdk
android:minSdkVersion="10"
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<supports-screens
@ -74,7 +72,7 @@
android:theme="@style/Theme.MediaPlayer" android:screenOrientation="portrait"/>
<service
android:name="de.danoeh.antennapod.service.DownloadService"
android:name=".service.download.DownloadService"
android:enabled="true" />
<service
android:name="de.danoeh.antennapod.service.PlaybackService"
@ -200,4 +198,4 @@
<activity android:name=".activity.VideoplayerActivity" android:configChanges="keyboardHidden|orientation" android:screenOrientation="landscape" android:theme="@style/VideoplayerTheme"></activity>
</application>
</manifest>
</manifest>