From 93eae114eac566a9ed2da6275c147b66ca480305 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Wed, 2 Jul 2014 00:34:21 +0200
Subject: Encrypt/Decrypt UI work

---
 .../src/main/res/layout/encrypt_content_adv_settings.xml    | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
index ac990653a..8394fd4fe 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
@@ -35,19 +35,6 @@
                 android:text="@string/label_delete_after_encryption"/>
     </LinearLayout>
 
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-        <CheckBox
-                android:id="@+id/shareAfterEncryption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_share_after_encryption"/>
-    </LinearLayout>
-
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-- 
cgit v1.2.3


From 1b0666e9de5caea14997a3e638a6209b45c97d60 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Sun, 6 Jul 2014 02:10:35 +0200
Subject: Many changes to file ... and still incomplete

- Multi file
- Reworked UI
---
 .../res/layout/encrypt_content_adv_settings.xml    | 26 ----------------------
 1 file changed, 26 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
index 8394fd4fe..67f7032c1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
@@ -21,30 +21,4 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"/>
     </LinearLayout>
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-        <CheckBox
-                android:id="@+id/deleteAfterEncryption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_delete_after_encryption"/>
-    </LinearLayout>
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-        <CheckBox
-                android:id="@+id/asciiArmor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_ascii_armor"/>
-    </LinearLayout>
 </merge>
-- 
cgit v1.2.3