introduced a general application to handle certain Intents, only to hand them to other APG Activities after looking at the content of the passed data

3 files changed, 55 insertions, 4 deletions

diff --git a/res/layout/general.xml b/res/layout/general.xml
new file mode 100644
index 000000000..afc776a33
--- /dev/null
+++ b/res/layout/general.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@+id/options"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:padding="5dip"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:text="dummy"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:visibility="invisible"/>
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:text="@android:string/cancel"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="2"/>
+
+        <Button
+            android:text="dummy"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:visibility="invisible"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index f88c393db..3603f656e 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -50,14 +50,14 @@
             <Button
                 android:id="@+id/btn_encryptFile"
                 android:text="@string/btn_encryptFile"
-                android:layout_width="wrap_content"
+                android:layout_width="0dip"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"/>
 
             <Button
                 android:id="@+id/btn_decryptFile"
                 android:text="@string/btn_decryptFile"
-                android:layout_width="wrap_content"
+                android:layout_width="0dip"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"/>
 
@@ -71,14 +71,14 @@
             <Button
                 android:id="@+id/btn_encryptMessage"
                 android:text="@string/btn_encryptMessage"
-                android:layout_width="wrap_content"
+                android:layout_width="0dip"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"/>
 
             <Button
                 android:id="@+id/btn_decryptMessage"
                 android:text="@string/btn_decryptMessage"
-                android:layout_width="wrap_content"
+                android:layout_width="0dip"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"/>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 72c1d1f9c..e4f89baf5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -243,5 +243,12 @@
     <string name="permission_read_key_details_label">Read key details from APG.</string>
     <string name="permission_read_key_details_description">Read of public and secret keys stored in APG, such as key ID and user IDs. The keys themselves can NOT be read.</string>
 
+    <!-- action strings -->
+    <string name="action_encrypt">Encrypt</string>
+    <string name="action_decrypt">Decrypt</string>
+    <string name="action_import_public">Import Public Keys</string>
+    <string name="action_import_secret">Import Secret Keys</string>
+
+
 </resources>