diff options
| author | Andrew Dolgov <[email protected]> | 2012-09-19 23:49:03 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-09-19 23:49:03 +0400 |
| commit | d361b0fec497911de1e8616cb4d0768601e07171 (patch) | |
| tree | f5f92112ca8451d255e765b9f5d1670a79b6850a /AndroidManifest.xml | |
| parent | 71fb6880f565ff417ccd5ac387263dfb8bd05826 (diff) | |
| parent | 45992f20f25bc94f2f81df2392df26b6c6f8cea7 (diff) | |
merge separate-activities
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc4254c1..1f72589d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="98" - android:versionName="0.7.6" > + android:versionCode="100" + android:versionName="0.8.0" > <uses-sdk android:minSdkVersion="8" @@ -13,21 +13,14 @@ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <application + android:name=".GlobalState" android:allowBackup="true" android:backupAgent=".util.PrefsBackupAgent" android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/app_name" > <activity - android:name=".LoginActivity" - android:label="@string/app_name" > - </activity> - <activity - android:name=".offline.OfflineActivity" - android:label="@string/app_name" > - </activity> - <activity - android:name=".MainActivity" + android:name=".OnlineActivity" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -40,6 +33,41 @@ android:label="@string/preferences" > </activity> + <activity + android:name=".FeedsActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".HeadlinesActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".CommonActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".ArticleActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".offline.OfflineActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".offline.OfflineFeedsActivity" + android:label="@string/app_name" > + </activity> + + <activity + android:name=".offline.OfflineHeadlinesActivity" + android:label="@string/app_name" > + </activity> + <service android:name=".offline.OfflineDownloadService" android:enabled="true" /> |