From 95f1527afe81c59a116cadc2ed37c065da1819ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 29 Mar 2015 20:37:54 +0200
Subject: Fixing crashes with new encrypt ui

---
 .../src/main/res/menu/encrypt_file_activity.xml    | 50 ----------------------
 .../src/main/res/menu/encrypt_file_fragment.xml    | 50 ++++++++++++++++++++++
 .../src/main/res/menu/encrypt_text_activity.xml    | 34 ---------------
 .../src/main/res/menu/encrypt_text_fragment.xml    | 34 +++++++++++++++
 4 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml

(limited to 'OpenKeychain/src/main/res/menu')

diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
deleted file mode 100644
index d6ed726fa..000000000
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/encrypt_save"
-        android:title="@string/btn_encrypt_save_file"
-        android:icon="@drawable/ic_action_encrypt_save_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/encrypt_share"
-        android:title="@string/btn_encrypt_share_file"
-        android:icon="@drawable/ic_action_encrypt_share_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/check_use_symmetric"
-        android:title="@string/label_symmetric"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_delete_after_encrypt"
-        android:title="@string/label_delete_after_encryption"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_enable_compression"
-        android:title="@string/label_enable_compression"
-        android:checked="true"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_encrypt_filenames"
-        android:title="@string/label_encrypt_filenames"
-        android:checked="true"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_use_armor"
-        android:title="@string/label_file_ascii_armor"
-        android:checkable="true" />
-
-    <!--<item-->
-        <!--android:id="@+id/check_hidden_recipients"-->
-        <!--android:title="@string/label_hidden_recipients"-->
-        <!--android:checked="false"-->
-        <!--android:checkable="true" />-->
-
-</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
new file mode 100644
index 000000000..d6ed726fa
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/encrypt_save"
+        android:title="@string/btn_encrypt_save_file"
+        android:icon="@drawable/ic_action_encrypt_save_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/encrypt_share"
+        android:title="@string/btn_encrypt_share_file"
+        android:icon="@drawable/ic_action_encrypt_share_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/check_use_symmetric"
+        android:title="@string/label_symmetric"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_delete_after_encrypt"
+        android:title="@string/label_delete_after_encryption"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_enable_compression"
+        android:title="@string/label_enable_compression"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_encrypt_filenames"
+        android:title="@string/label_encrypt_filenames"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_use_armor"
+        android:title="@string/label_file_ascii_armor"
+        android:checkable="true" />
+
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
+
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
deleted file mode 100644
index 5a262fdd8..000000000
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/encrypt_copy"
-        android:title="@string/btn_copy_encrypted_signed"
-        android:icon="@drawable/ic_action_encrypt_copy_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/encrypt_share"
-        android:title="@string/btn_share_encrypted_signed"
-        android:icon="@drawable/ic_action_encrypt_share_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/check_use_symmetric"
-        android:title="@string/label_symmetric"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_enable_compression"
-        android:title="@string/label_enable_compression"
-        android:checked="true"
-        android:checkable="true" />
-
-    <!--<item-->
-        <!--android:id="@+id/check_hidden_recipients"-->
-        <!--android:title="@string/label_hidden_recipients"-->
-        <!--android:checked="false"-->
-        <!--android:checkable="true" />-->
-
-</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
new file mode 100644
index 000000000..5a262fdd8
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/encrypt_copy"
+        android:title="@string/btn_copy_encrypted_signed"
+        android:icon="@drawable/ic_action_encrypt_copy_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/encrypt_share"
+        android:title="@string/btn_share_encrypted_signed"
+        android:icon="@drawable/ic_action_encrypt_share_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/check_use_symmetric"
+        android:title="@string/label_symmetric"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_enable_compression"
+        android:title="@string/label_enable_compression"
+        android:checked="true"
+        android:checkable="true" />
+
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
+
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3