Resolve crashes on Android 2.3 due to ActionBarCompat conversion

9 files changed, 65 insertions, 76 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
index 3dc8d5e84..e60ad50e3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="vertical" >
 
     <fragment
diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
index 351aec512..182540dc5 100644
--- a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
diff --git a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
index 1ee05f5de..82ee57a73 100644
--- a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
index 38c52e7f0..16992affb 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_edit.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
index 72ebe0216..cdd755dc3 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
index e750c1259..f7b415441 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
index c610eda35..18a97ed72 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
index 8cd181e16..9cfab9fd3 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
@@ -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>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
index 6d7a06ece..acf3eb099 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
@@ -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>
\ No newline at end of file