projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #354 from LukeOwncloud/added_more_git_notes_to_setup_md
[pub/Android/ownCloud.git]
/
AndroidManifest.xml
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index
2035a9d
..
c1202e6
100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-18,8
+18,8
@@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
- android:versionCode="10
4006
"
- android:versionName="1.
4.6
" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:versionCode="10
5003
"
+ android:versionName="1.
5.3
" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@
-38,7
+38,7
@@
<uses-sdk
android:minSdkVersion="8"
<uses-sdk
android:minSdkVersion="8"
- android:targetSdkVersion="1
3
" />
+ android:targetSdkVersion="1
9
" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
</uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
</uses-permission>
@@
-63,7
+63,7
@@
<activity android:name=".ui.activity.InstantUploadActivity">
</activity>
<activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
<activity android:name=".ui.activity.InstantUploadActivity">
</activity>
<activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
- <activity android:name=".Uploader" >
+ <activity android:name=".
ui.activity.
Uploader" >
<intent-filter>
<action android:name="android.intent.action.SEND" >
</action>
<intent-filter>
<action android:name="android.intent.action.SEND" >
</action>
@@
-112,7
+112,8
@@
</service>
<service
android:name=".syncadapter.FileSyncService"
</service>
<service
android:name=".syncadapter.FileSyncService"
- android:exported="true" >
+ android:exported="true"
+ >
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>