cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve crashes on Android 2.3 due to ActionBarCompat conversion

Browse Source
This commit is contained in:
Dominik Schürmann
2014-02-02 14:30:40 +01:00
parent 6eaf45940e
commit ef1401fc0d
11 changed files with 209 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
View File

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_api_settings_revoke"
android:showAsAction="never"
android:title="@string/api_settings_revoke"/>
android:title="@string/api_settings_revoke"
app:showAsAction="never" />
<item
android:id="@+id/menu_api_settings_cancel"
android:showAsAction="never"
android:title="@string/api_settings_cancel"/>
android:title="@string/api_settings_cancel"
app:showAsAction="never" />
</menu>

15
OpenPGP-Keychain/src/main/res/menu/key_edit.xml
View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_edit_export_file"
android:showAsAction="never"
android:title="@string/menu_export_key"/>
app:showAsAction="never"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_edit_delete"
android:showAsAction="never"
android:title="@string/menu_delete_key"/>
app:showAsAction="never"
android:title="@string/menu_delete_key" />
<item
android:id="@+id/menu_key_edit_cancel"
android:showAsAction="never"
android:title="@string/menu_key_edit_cancel"/>
app:showAsAction="never"
android:title="@string/menu_key_edit_cancel" />
</menu>

11
OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_list_public_import"
android:showAsAction="always|withText"
app:showAsAction="always|withText"
android:icon="@drawable/ic_action_add_person"
android:title="@string/menu_import"/>
android:title="@string/menu_import" />
<item
android:id="@+id/menu_key_list_public_export"
android:showAsAction="never"
android:title="@string/menu_export_keys"/>
app:showAsAction="never"
android:title="@string/menu_export_keys" />
</menu>

6
OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_key_list_public_multi_encrypt"
android:title="@string/menu_encrypt_to"/>
android:title="@string/menu_encrypt_to" />
<item
android:id="@+id/menu_key_list_public_multi_delete"
android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key"/>
android:title="@string/menu_delete_key" />
</menu>

19
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
View File

@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_list_secret_create"
android:showAsAction="always|withText"
android:title="@string/menu_create_key"/>
app:showAsAction="always|withText"
android:title="@string/menu_create_key" />
<item
android:id="@+id/menu_key_list_secret_create_expert"
android:showAsAction="never"
android:title="@string/menu_create_key_expert"/>
app:showAsAction="never"
android:title="@string/menu_create_key_expert" />
<item
android:id="@+id/menu_key_list_secret_import"
android:showAsAction="never"
android:title="@string/menu_import"/>
app:showAsAction="never"
android:title="@string/menu_import" />
<item
android:id="@+id/menu_key_list_secret_export"
android:showAsAction="never"
android:title="@string/menu_export_keys"/>
app:showAsAction="never"
android:title="@string/menu_export_keys" />
</menu>

4
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_key_list_public_multi_delete"
android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key"/>
android:title="@string/menu_delete_key" />
</menu>

55
OpenPGP-Keychain/src/main/res/menu/key_view.xml
View File

@@ -1,48 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share"
android:showAsAction="always"
app:showAsAction="always"
android:title="@string/menu_share">
<menu>
<item
android:id="@+id/menu_key_view_share_fingerprint_title"
android:showAsAction="never"
app:showAsAction="never"
android:title="@string/menu_share_title_fingerprint">
<menu>
<item
android:id="@+id/menu_key_view_share_default_fingerprint"
android:showAsAction="never"
android:title="@string/menu_share_default_fingerprint"/>
app:showAsAction="never"
android:title="@string/menu_share_default_fingerprint" />
<item
android:id="@+id/menu_key_view_share_qr_code_fingerprint"
android:showAsAction="never"
android:title="@string/menu_share_qr_code_fingerprint"/>
app:showAsAction="never"
android:title="@string/menu_share_qr_code_fingerprint" />
</menu>
</item>
<item
android:id="@+id/menu_key_view_share_title"
android:showAsAction="never"
app:showAsAction="never"
android:title="@string/menu_share_title">
<menu>
<item
android:id="@+id/menu_key_view_share_default"
android:showAsAction="never"
android:title="@string/menu_share_default"/>
app:showAsAction="never"
android:title="@string/menu_share_default" />
<item
android:id="@+id/menu_key_view_share_qr_code"
android:showAsAction="never"
android:title="@string/menu_share_qr_code"/>
app:showAsAction="never"
android:title="@string/menu_share_qr_code" />
<item
android:id="@+id/menu_key_view_share_nfc"
android:showAsAction="never"
android:title="@string/menu_share_nfc"/>
app:showAsAction="never"
android:title="@string/menu_share_nfc" />
<item
android:id="@+id/menu_key_view_share_clipboard"
android:showAsAction="never"
android:title="@string/menu_copy_to_clipboard"/>
app:showAsAction="never"
android:title="@string/menu_copy_to_clipboard" />
</menu>
</item>
</menu>
@@ -50,30 +51,30 @@
<item
android:id="@+id/menu_key_keyserver"
android:icon="@drawable/ic_action_import_export"
android:showAsAction="always"
app:showAsAction="always"
android:title="@string/menu_share">
<menu>
<item
android:id="@+id/menu_key_view_update"
android:showAsAction="never"
android:title="@string/menu_update_key"/>
app:showAsAction="never"
android:title="@string/menu_update_key" />
<item
android:id="@+id/menu_key_view_export_keyserver"
android:showAsAction="never"
android:title="@string/menu_export_key_to_server"/>
app:showAsAction="never"
android:title="@string/menu_export_key_to_server" />
</menu>
</item>
<item
android:id="@+id/menu_key_view_sign"
android:showAsAction="ifRoom"
android:title="@string/menu_sign_key"/>
app:showAsAction="ifRoom"
android:title="@string/menu_sign_key" />
<item
android:id="@+id/menu_key_view_export_file"
android:showAsAction="never"
android:title="@string/menu_export_key"/>
app:showAsAction="never"
android:title="@string/menu_export_key" />
<item
android:id="@+id/menu_key_view_delete"
android:showAsAction="never"
android:title="@string/menu_delete_key"/>
app:showAsAction="never"
android:title="@string/menu_delete_key" />
</menu>