help activity

3 files changed, 33 insertions, 25 deletions

diff --git a/org_apg/res/layout/decrypt.xml b/org_apg/res/layout/decrypt.xml
index 98cb4f1f9..c259bb5be 100644
--- a/org_apg/res/layout/decrypt.xml
+++ b/org_apg/res/layout/decrypt.xml
@@ -48,10 +48,10 @@
                     android:id="@+id/sourceLabel"
                     android:layout_width="0dip"
                     android:layout_height="fill_parent"
+                    android:layout_weight="1"
                     android:gravity="center_horizontal|center_vertical"
                     android:text="@string/label_message"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="#ffffffff" />
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <ImageView
                     android:id="@+id/sourceNext"
@@ -103,7 +103,7 @@
                             android:id="@+id/btn_browse"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@drawable/ic_launcher_folder_small" />
+                            android:src="@drawable/ic_menu_filebrowser" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -180,25 +180,4 @@
         </LinearLayout>
     </LinearLayout>
 
-<!--     <LinearLayout -->
-<!--         style="@android:style/ButtonBar" -->
-<!--         android:layout_width="fill_parent" -->
-<!--         android:layout_height="wrap_content" -->
-<!--         android:orientation="horizontal" > -->
-
-<!--         <Button -->
-<!--             android:id="@+id/btn_reply" -->
-<!--             android:layout_width="0dip" -->
-<!--             android:layout_height="fill_parent" -->
-<!--             android:layout_weight="1" -->
-<!--             android:text="@string/btn_reply" /> -->
-
-<!--         <Button -->
-<!--             android:id="@+id/btn_decrypt" -->
-<!--             android:layout_width="0dip" -->
-<!--             android:layout_height="fill_parent" -->
-<!--             android:layout_weight="1" -->
-<!--             android:text="@string/btn_decrypt" /> -->
-<!--     </LinearLayout> -->
-
 </LinearLayout>
\ No newline at end of file
diff --git a/org_apg/res/layout/encrypt.xml b/org_apg/res/layout/encrypt.xml
index 7750ab129..9fc3da676 100644
--- a/org_apg/res/layout/encrypt.xml
+++ b/org_apg/res/layout/encrypt.xml
@@ -1,5 +1,19 @@
 <?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. -->
+<!--
+     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"
     android:layout_width="fill_parent"
@@ -173,6 +187,7 @@
                 android:id="@+id/modeLabel"
                 android:layout_width="0dip"
                 android:layout_height="fill_parent"
+                android:layout_weight="1"
                 android:gravity="center_horizontal|center_vertical"
                 android:text="@string/label_asymmetric"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/org_apg/res/layout/help_activity.xml b/org_apg/res/layout/help_activity.xml
new file mode 100644
index 000000000..12ac366d7
--- /dev/null
+++ b/org_apg/res/layout/help_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <TextView
+        android:id="@+id/help_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textColor="#000" >
+    </TextView>
+
+</ScrollView>
\ No newline at end of file