overdue merge of 0.9.x into trunk

This commit is contained in:
Thialfihar
2010-05-18 15:23:25 +00:00
141 changed files with 6986 additions and 3046 deletions

View File

@@ -14,75 +14,104 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.thialfihar.android.apg"
android:versionCode="3" android:versionName="0.8.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|keyboard">
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="org.thialfihar.android.apg"
android:versionName="0.9.5" android:versionCode="10">
<application
android:icon="@drawable/icon"
android:label="@string/app_name">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|keyboard">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".PublicKeyListActivity"
android:label="@string/title_managePublicKeys"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".PublicKeyListActivity"
android:label="@string/title_managePublicKeys"
android:configChanges="keyboardHidden|orientation|keyboard" />
<activity android:name=".SecretKeyListActivity"
android:label="@string/title_manageSecretKeys"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".SecretKeyListActivity"
android:label="@string/title_manageSecretKeys"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<activity android:name=".EditKeyActivity"
android:label="@string/title_editKey"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".EditKeyActivity"
android:label="@string/title_editKey"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<activity android:name=".SelectPublicKeyListActivity"
android:label="@string/title_selectRecipients"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".SelectPublicKeyListActivity"
android:label="@string/title_selectRecipients"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<activity android:name=".SelectSecretKeyListActivity"
android:label="@string/title_selectSignature"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".SelectSecretKeyListActivity"
android:label="@string/title_selectSignature"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<activity
android:name=".EncryptActivity"
android:label="@string/title_encrypt"
android:configChanges="keyboardHidden|orientation|keyboard">
<activity android:name=".EncryptMessageActivity"
android:label="@string/title_encryptMessage"
android:configChanges="keyboardHidden|orientation|keyboard">
<intent-filter>
<action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
<action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
</intent-filter>
</activity>
<activity android:name=".DecryptMessageActivity"
android:label="@string/title_decryptMessage"
android:configChanges="keyboardHidden|orientation|keyboard">
<activity
android:name=".DecryptActivity"
android:label="@string/title_decrypt"
android:configChanges="keyboardHidden|orientation|keyboard">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="text/*"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="text/*"/>
</intent-filter>
<intent-filter>
<action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
<action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
</intent-filter>
</activity>
<activity android:name=".MailListActivity"
android:label="@string/title_mailInbox"
android:configChanges="keyboardHidden|orientation|keyboard">
</activity>
<activity
android:name=".MailListActivity"
android:label="@string/title_mailInbox"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<provider android:name="org.thialfihar.android.apg.provider.DataProvider"
android:authorities="org.thialfihar.android.apg.provider" />
<activity
android:name=".PreferencesActivity"
android:label="@string/title_preferences"
android:configChanges="keyboardHidden|orientation|keyboard"/>
<provider
android:name="org.thialfihar.android.apg.provider.DataProvider"
android:authorities="org.thialfihar.android.apg.provider" />
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="5" />
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
<uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>