layout adjustments, force portrait layout for EncryptFileActivity for now, (En|De)cryptFileActivity can now handle symmetric algorithms

2 files changed, 170 insertions, 161 deletions

diff --git a/res/layout/encrypt_file.xml b/res/layout/encrypt_file.xml
index 0c388fbe7..2945cf89f 100644
--- a/res/layout/encrypt_file.xml
+++ b/res/layout/encrypt_file.xml
@@ -21,204 +21,213 @@
     android:orientation="vertical"
     android:paddingTop="5dip">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip">
-
-        <TextView
-            android:id="@+id/label_filename"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="50dip"
-            android:layout_height="wrap_content"
-            android:text="@string/label_file"/>
-
-        <EditText
-            android:id="@+id/filename"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-        <ImageButton
-            android:id="@+id/btn_browse"
-            android:src="@drawable/ic_launcher_folder_small"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"/>
-
-    </LinearLayout>
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingLeft="5dip">
 
-    <CheckBox
-        android:id="@+id/ascii_armour"
-        android:text="@string/ascii_armour"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"/>
+                <TextView
+                    android:id="@+id/label_filename"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="50dip"
+                    android:layout_height="wrap_content"
+                    android:text="@string/label_file"/>
 
-    <TabHost
-        android:id="@+id/tab_host"
-        android:layout_weight="1"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip">
+                <EditText
+                    android:id="@+id/filename"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
 
-        <TabWidget
-            android:id="@android:id/tabs"
-            android:layout_width="fill_parent"
-            android:layout_height="65dip"/>
+                <ImageButton
+                    android:id="@+id/btn_browse"
+                    android:src="@drawable/ic_launcher_folder_small"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"/>
 
-        <FrameLayout
-            android:id="@android:id/tabcontent"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:paddingTop="65dip">
+            </LinearLayout>
 
-<!-- -->
-            <LinearLayout
-                android:id="@+id/tab_asymmetric"
-                android:layout_width="fill_parent"
+            <TableLayout
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_width="fill_parent"
+                android:stretchColumns="1"
+                android:paddingLeft="6dip">
 
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="3dip"
-                    android:orientation="horizontal">
+                <TableRow>
 
-                    <CheckBox
-                        android:text="@string/sign"
-                        android:id="@+id/sign"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"/>
+                    <TextView android:id="@+id/label_algorithm"
+                              android:text="Algorithm:"
+                              android:layout_height="wrap_content"
+                              android:layout_width="wrap_content"
+                              android:layout_gravity="center_vertical"
+                              android:paddingRight="10dip"/>
 
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_height="wrap_content"
+                    <Spinner
+                        android:id="@+id/algorithm"
                         android:layout_width="fill_parent"
-                        android:layout_gravity="center_vertical"
-                        android:paddingRight="5dip">
-
-                        <TextView
-                            android:id="@+id/main_user_id"
-                            android:text="Main User Id"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"/>
+                        android:layout_height="wrap_content"/>
 
-                        <TextView
-                            android:id="@+id/main_user_id_rest"
-                            android:text="Main User Id Rest"
-                            android:textAppearance="?android:attr/textAppearanceSmall"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"/>
+                </TableRow>
 
-                    </LinearLayout>
+                <TableRow>
 
-                </LinearLayout>
+                    <TextView
+                        android:id="@+id/label_ascii_armour"
+                        android:text="@string/ascii_armour"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"/>
 
-                <View
-                    android:id="@+id/separator"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dip"
-                    android:background="?android:attr/listDivider"/>
+                    <CheckBox
+                        android:id="@+id/ascii_armour"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:layout_gravity="right|center_vertical"/>
 
-                <TextView
-                    android:id="@+id/label_encrypt_keys"
-                    android:text="@string/label_encrypt_keys"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                </TableRow>
 
-                <ListView
-                    android:id="@+id/public_key_list"
-                    android:choiceMode="multipleChoice"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0dip"
-                    android:layout_weight="1"/>
+            </TableLayout>
 
-            </LinearLayout>
- <!-- -->
-            <ScrollView
-                android:id="@+id/tab_symmetric"
+            <TabHost
+                android:id="@+id/tab_host"
+                android:layout_weight="1"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:fillViewport="true">
+                android:layout_height="0dip">
 
-                <LinearLayout
+                <TabWidget
+                    android:id="@android:id/tabs"
+                    android:layout_width="fill_parent"
+                    android:layout_height="65dip"/>
+
+                <FrameLayout
+                    android:id="@android:id/tabcontent"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-                    android:orientation="vertical"
-                    android:paddingTop="3dip">
+                    android:paddingTop="65dip">
 
-                    <TableLayout
-                        android:layout_height="fill_parent"
+        <!-- -->
+                    <LinearLayout
+                        android:id="@+id/tab_asymmetric"
                         android:layout_width="fill_parent"
-                        android:stretchColumns="1"
-                        android:layout_marginRight="?android:attr/scrollbarSize"
-                        android:paddingLeft="6dip">
-
-                        <TableRow
-                            android:layout_marginBottom="5dip">
-
-                            <TextView android:id="@+id/label_algorithm"
-                                      android:text="Algorithm:"
-                                      android:layout_height="wrap_content"
-                                      android:layout_width="wrap_content"
-                                      android:layout_gravity="center_vertical"
-                                      android:paddingRight="10dip"/>
-
-                            <Spinner
-                                android:id="@+id/algorithm"
+                        android:layout_height="fill_parent"
+                        android:orientation="vertical">
+
+                        <LinearLayout
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingBottom="3dip"
+                            android:orientation="horizontal">
+
+                            <CheckBox
+                                android:text="@string/sign"
+                                android:id="@+id/sign"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"/>
+
+                            <LinearLayout
+                                android:orientation="vertical"
+                                android:layout_height="wrap_content"
                                 android:layout_width="fill_parent"
-                                android:layout_height="wrap_content"/>
+                                android:layout_gravity="center_vertical"
+                                android:paddingRight="5dip">
+
+                                <TextView
+                                    android:id="@+id/main_user_id"
+                                    android:text="Main User Id"
+                                    android:textAppearance="?android:attr/textAppearanceMedium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="right"/>
+
+                                <TextView
+                                    android:id="@+id/main_user_id_rest"
+                                    android:text="Main User Id Rest"
+                                    android:textAppearance="?android:attr/textAppearanceSmall"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="right"/>
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <View
+                            android:id="@+id/separator"
+                            android:layout_width="fill_parent"
+                            android:layout_height="1dip"
+                            android:background="?android:attr/listDivider"/>
 
-                        </TableRow>
+                        <TextView
+                            android:id="@+id/label_encrypt_keys"
+                            android:text="@string/label_encrypt_keys"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
 
-                        <TableRow>
+                        <ListView
+                            android:id="@+id/public_key_list"
+                            android:choiceMode="multipleChoice"
+                            android:layout_width="fill_parent"
+                            android:layout_height="fill_parent"/>
 
-                            <TextView android:id="@+id/label_pass_phrase"
-                                      android:text="Pass phrase"
-                                      android:layout_height="wrap_content"
-                                      android:layout_width="wrap_content"
-                                      android:layout_gravity="center_vertical"
-                                      android:paddingRight="10dip"/>
+                    </LinearLayout>
+         <!-- -->
+                    <LinearLayout
+                        android:id="@+id/tab_symmetric"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:orientation="vertical"
+                        android:paddingTop="3dip">
+
+                        <TableLayout
+                            android:layout_height="fill_parent"
+                            android:layout_width="fill_parent"
+                            android:stretchColumns="1"
+                            android:paddingLeft="6dip">
 
-                            <EditText android:id="@+id/pass_phrase"
-                                      android:layout_height="wrap_content"
-                                      android:layout_width="fill_parent"
-                                      android:inputType="textPassword"/>
+                            <TableRow>
 
-                        </TableRow>
+                                <TextView android:id="@+id/label_pass_phrase"
+                                          android:text="Pass phrase"
+                                          android:layout_height="wrap_content"
+                                          android:layout_width="wrap_content"
+                                          android:layout_gravity="center_vertical"
+                                          android:paddingRight="10dip"/>
 
-                        <TableRow>
+                                <EditText android:id="@+id/pass_phrase"
+                                          android:layout_height="wrap_content"
+                                          android:layout_width="fill_parent"
+                                          android:inputType="textPassword"/>
 
-                            <TextView android:id="@+id/label_pass_phrase_again"
-                                      android:text="Again:"
-                                      android:layout_height="wrap_content"
-                                      android:layout_width="wrap_content"
-                                      android:layout_gravity="center_vertical"
-                                      android:paddingRight="10dip"/>
+                            </TableRow>
 
-                            <EditText android:id="@+id/pass_phrase_again"
-                                      android:layout_height="wrap_content"
-                                      android:layout_width="fill_parent"
-                                      android:inputType="textPassword"/>
+                            <TableRow>
 
-                        </TableRow>
+                                <TextView android:id="@+id/label_pass_phrase_again"
+                                          android:text="Again:"
+                                          android:layout_height="wrap_content"
+                                          android:layout_width="wrap_content"
+                                          android:layout_gravity="center_vertical"
+                                          android:paddingRight="10dip"/>
 
-                    </TableLayout>
+                                <EditText android:id="@+id/pass_phrase_again"
+                                          android:layout_height="wrap_content"
+                                          android:layout_width="fill_parent"
+                                          android:inputType="textPassword"/>
 
+                            </TableRow>
 
-                </LinearLayout>
+                        </TableLayout>
 
-            </ScrollView>
 
-        </FrameLayout>
+                    </LinearLayout>
+
+                </FrameLayout>
 
-    </TabHost>
+            </TabHost>
 
     <LinearLayout
         android:orientation="horizontal"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ad12d0ff..02a93d5bd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -45,8 +45,8 @@
     <string name="btn_save">Save</string>
     <string name="btn_doNotSave">Cancel</string>
 
-    <string name="tab_symmetric">Symmetric</string>
-    <string name="tab_asymmetric">Asymmetric</string>
+    <string name="tab_symmetric">Use Pass Phrase</string>
+    <string name="tab_asymmetric">Use Public Key</string>
 
     <string name="menu_about">About</string>
     <string name="menu_addAccount">Add GMail Account</string>