overdue merge of 0.9.x into trunk

AndroidManifest.xml

@@ -14,75 +14,104 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.thialfihar.android.apg"
-      android:versionCode="3" android:versionName="0.8.0">
+    android:versionName="0.9.5" android:versionCode="10">
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
+
-        <activity android:name=".MainActivity"
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name">
+
+        <activity
+            android:name=".MainActivity"
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|keyboard">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
         </activity>
 
-        <activity android:name=".PublicKeyListActivity"
+        <activity
+            android:name=".PublicKeyListActivity"
             android:label="@string/title_managePublicKeys"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard" />
-        </activity>
 
-        <activity android:name=".SecretKeyListActivity"
+        <activity
+            android:name=".SecretKeyListActivity"
             android:label="@string/title_manageSecretKeys"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
-        </activity>
 
-        <activity android:name=".EditKeyActivity"
+        <activity
+            android:name=".EditKeyActivity"
             android:label="@string/title_editKey"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
-        </activity>
 
-        <activity android:name=".SelectPublicKeyListActivity"
+        <activity
+            android:name=".SelectPublicKeyListActivity"
             android:label="@string/title_selectRecipients"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
-        </activity>
 
-        <activity android:name=".SelectSecretKeyListActivity"
+        <activity
+            android:name=".SelectSecretKeyListActivity"
             android:label="@string/title_selectSignature"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
-        </activity>
 
-        <activity android:name=".EncryptMessageActivity"
+        <activity
-                  android:label="@string/title_encryptMessage"
+            android:name=".EncryptActivity"
+            android:label="@string/title_encrypt"
             android:configChanges="keyboardHidden|orientation|keyboard">
+
             <intent-filter>
                 <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
+                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
             </intent-filter>
+
         </activity>
 
-        <activity android:name=".DecryptMessageActivity"
+        <activity
-                  android:label="@string/title_decryptMessage"
+            android:name=".DecryptActivity"
+            android:label="@string/title_decrypt"
             android:configChanges="keyboardHidden|orientation|keyboard">
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="text/*"/>
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/*"/>
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
+                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
             </intent-filter>
+
         </activity>
 
-        <activity android:name=".MailListActivity"
+        <activity
+            android:name=".MailListActivity"
             android:label="@string/title_mailInbox"
-                  android:configChanges="keyboardHidden|orientation|keyboard">
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
-        </activity>
 
-        <provider android:name="org.thialfihar.android.apg.provider.DataProvider"
+        <activity
+            android:name=".PreferencesActivity"
+            android:label="@string/title_preferences"
+            android:configChanges="keyboardHidden|orientation|keyboard"/>
+
+        <provider
+            android:name="org.thialfihar.android.apg.provider.DataProvider"
             android:authorities="org.thialfihar.android.apg.provider" />
 
     </application>
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="5" />
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
 
 <uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>

res/anim/push_left_in.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>

res/anim/push_left_out.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>

res/anim/push_right_in.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>

res/anim/push_right_out.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+  <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="500"/>
+  <alpha android:fromAlpha="1.0" android:toAlpha="1.0" android:duration="500" />
+</set>

res/layout/account_item.xml

@@ -24,8 +24,8 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-<TextView
+    <TextView
-    android:id="@+id/account_name"
+        android:id="@+id/accountName"
         android:text="someone@gmail.com"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_width="fill_parent"

res/layout/create_key.xml

@@ -18,35 +18,47 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent">
+
         <TableLayout
             android:layout_height="fill_parent"
             android:layout_width="fill_parent"
             android:stretchColumns="1"
             android:layout_marginRight="?android:attr/scrollbarSize"
             android:paddingLeft="6dip">
+
             <TableRow>
+
                 <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_width="fill_parent"
                     android:layout_height="wrap_content"/>
+
             </TableRow>
+
             <TableRow>
+
                 <TextView android:id="@+id/label_size"
                           android:text="Key Size"
                           android:layout_height="wrap_content"
                           android:layout_width="wrap_content"
                           android:layout_gravity="center_vertical"
                           android:paddingRight="10dip"/>
+
                 <EditText android:id="@+id/size"
                           android:text="1024"
                           android:layout_height="wrap_content"
-                          android:layout_width="fill_parent" android:gravity="right" android:numeric="integer"/>
+                          android:layout_width="fill_parent"
+                          android:gravity="right"
+                          android:numeric="integer"/>
             </TableRow>
+
         </TableLayout>
+
 </ScrollView>

res/layout/decrypt.xml

@@ -0,0 +1,214 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/sourceLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <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">
+
+                        <TextView
+                            android:id="@+id/label_deleteAfterDecryption"
+                            android:text="@string/label_deleteAfterDecryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/deleteAfterDecryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/signature"
+        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent">
+
+        <RelativeLayout
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content">
+
+            <ImageView
+                android:id="@+id/ic_signature"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/signed_large"/>
+
+            <ImageView
+                android:id="@+id/ic_signature_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/overlay_error"/>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:paddingLeft="5dip">
+
+            <TextView
+                android:id="@+id/mainUserId"
+                android:text="Main User Id"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+            <TextView
+                android:id="@+id/mainUserIdRest"
+                android:text="Main User Id Rest"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_reply"
+            android:text="@string/btn_reply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+        <Button
+            android:id="@+id/btn_decrypt"
+            android:text="@string/btn_decrypt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+
+</LinearLayout>

res/layout/decrypt_message.xml

@@ -1,97 +0,0 @@
-<?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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true">
-
-<EditText
-    android:id="@+id/message"
-    android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-    android:layout_width="fill_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1"
-    android:gravity="top"/>
-
-<LinearLayout
-    android:orientation="horizontal"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip">
-
-<LinearLayout
-    android:id="@+id/layout_signature"
-    android:orientation="horizontal"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:layout_weight="2">
-
-<RelativeLayout
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content">
-<ImageView
-    android:id="@+id/ic_signature"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/signed_large"/>
-
-<ImageView
-    android:id="@+id/ic_signature_status"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/overlay_error"/>
-
-</RelativeLayout>
-
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:paddingLeft="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="left"/>
-
-<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="left"/>
-
-</LinearLayout>
-</LinearLayout>
-
-<Button
-    android:id="@+id/btn_decrypt"
-    android:text="@string/btn_decrypt"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
-
-</LinearLayout>
-
-</LinearLayout>
-

res/layout/edit_key.xml

@@ -22,19 +22,21 @@
     android:paddingTop="5dip"
     android:fillViewport="true">
 
-<ScrollView
+    <ScrollView
         android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1">
-<LinearLayout
+
+        <LinearLayout
             android:id="@+id/container"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:orientation="vertical"
             android:layout_marginRight="?android:attr/scrollbarSize"/>
-</ScrollView>
 
-<LinearLayout
+    </ScrollView>
+
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -53,6 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/btn_doNotSave"/>
-</LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>

res/layout/edit_key_key_item.xml

@@ -21,93 +21,123 @@
     android:orientation="vertical"
     android:paddingLeft="5dip">
 
-<View
+    <View
         android:id="@+id/separator"
         android:layout_width="fill_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"/>
 
-<LinearLayout
+    <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="horizontal">
+
         <TableLayout
             android:layout_height="wrap_content"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_marginLeft="16dip"
             android:stretchColumns="1">
+
             <TableRow>
-            <TextView android:id="@+id/label_key_id" android:text="Key ID"
+
+                <TextView
+                   android:id="@+id/label_keyId"
+                   android:text="Key ID"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:paddingRight="10dip"/>
+
                 <TextView
-                android:id="@+id/key_id"
+                    android:id="@+id/keyId"
                     android:text="00000000 00000000"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:paddingRight="5dip"
                     android:typeface="monospace"/>
+
             </TableRow>
+
             <TableRow>
-            <TextView android:id="@+id/label_algorithm"
+
+                <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"/>
-            <TextView android:id="@+id/algorithm"
+
+                <TextView
+                    android:id="@+id/algorithm"
                     android:text="Name"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:paddingRight="5dip"/>
+
             </TableRow>
+
             <TableRow>
-            <TextView android:id="@+id/label_creation"
+
+                <TextView
+                    android:id="@+id/label_creation"
                     android:text="Creation"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:paddingRight="10dip"/>
+
                 <TextView
                     android:id="@+id/creation"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"/>
+
             </TableRow>
+
             <TableRow>
-            <TextView android:id="@+id/label_expiry"
+
+                <TextView
+                    android:id="@+id/label_expiry"
                     android:text="Expiry"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:paddingRight="10dip"/>
+
                 <Button
                     android:id="@+id/expiry"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"/>
+
             </TableRow>
+
             <TableRow>
-            <TextView android:id="@+id/label_usage"
+
+                <TextView
+                    android:id="@+id/label_usage"
                     android:text="Usage"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:paddingRight="10dip"/>
+
                 <Spinner
                     android:id="@+id/usage"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"/>
+
             </TableRow>
+
         </TableLayout>
 
         <ImageButton
-        android:id="@+id/edit_delete"
+            android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/MinusButton"
             android:layout_gravity="center_vertical"/>
 
-</LinearLayout>
+    </LinearLayout>
+
 </org.thialfihar.android.apg.ui.widget.KeyEditor>

res/layout/edit_key_user_id_item.xml

@@ -21,76 +21,93 @@
     android:orientation="vertical"
     android:paddingLeft="5dip">
 
-<View
+    <View
         android:id="@+id/separator"
         android:layout_width="fill_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"/>
 
-<RadioButton
+    <RadioButton
-  android:id="@+id/is_main_user_id" android:text="Main User ID"
+        android:id="@+id/isMainUserId"
-  android:layout_height="wrap_content" android:layout_width="wrap_content"
+        android:text="Main User ID"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_marginLeft="20dip"/>
 
-<LinearLayout
+    <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="horizontal">
+
         <TableLayout
             android:layout_height="wrap_content"
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_marginLeft="16dip">
+
             <TableRow>
+
                 <TextView
-              android:id="@+id/name_label"
+                    android:id="@+id/label_name"
                     android:text="Name"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:paddingRight="5dip"/>
+
                 <EditText
                     android:id="@+id/name"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"/>
+
             </TableRow>
+
             <TableRow>
+
                 <TextView
-              android:id="@+id/email_label"
+                    android:id="@+id/label_email"
                     android:text="Email"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:paddingRight="5dip"/>
+
                 <EditText
                     android:id="@+id/email"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"/>
+
             </TableRow>
+
             <TableRow>
+
                 <TextView
-              android:id="@+id/comment_label"
+                    android:id="@+id/label_comment"
                     android:text="Comment"
                     android:layout_gravity="center_vertical"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:paddingRight="5dip"/>
+
                 <EditText
                     android:id="@+id/comment"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"/>
+
             </TableRow>
+
         </TableLayout>
 
         <ImageButton
-        android:id="@+id/edit_delete"
+            android:id="@+id/delete"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/MinusButton"
             android:layout_gravity="center_vertical"/>
 
-</LinearLayout>
+    </LinearLayout>
+
 </org.thialfihar.android.apg.ui.widget.UserIdEditor>

res/layout/encrypt.xml

@@ -0,0 +1,382 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:paddingTop="5dip">
+
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical"
+            android:layout_marginLeft="5dip">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/sourcePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/sourceLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_message"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/sourceNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/source"
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1">
+
+                <LinearLayout
+                    android:id="@+id/sourceMessage"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:gravity="top"
+                        android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/sourceFile"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <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">
+
+                         <TextView
+                             android:id="@+id/label_fileCompression"
+                             android:text="@string/label_fileCompression"
+                             android:textAppearance="?android:attr/textAppearanceMedium"
+                             android:layout_height="wrap_content"
+                             android:layout_width="0dip"
+                             android:layout_weight="1"
+                             android:layout_gravity="center_vertical"
+                             android:paddingRight="10dip"/>
+
+                         <Spinner
+                             android:id="@+id/fileCompression"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_deleteAfterEncryption"
+                            android:text="@string/label_deleteAfterEncryption"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/deleteAfterEncryption"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_asciiArmour"
+                            android:text="@string/label_asciiArmour"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"/>
+
+                        <CheckBox
+                            android:id="@+id/asciiArmour"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/modePrevious"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_previous"/>
+
+                <TextView
+                    android:id="@+id/modeLabel"
+                    android:layout_width="0dip"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="1"
+                    android:text="@string/label_asymmetric"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:gravity="center_horizontal|center_vertical"
+                    android:textColor="#ffffffff"/>
+
+                <ImageView
+                    android:id="@+id/modeNext"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_next"/>
+
+            </LinearLayout>
+
+            <ViewFlipper
+                android:id="@+id/mode"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/modeAsymmetric"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_sign"
+                            android:text="@string/label_sign"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                        <LinearLayout
+                            android:orientation="vertical"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="5dip">
+
+                            <TextView
+                                android:id="@+id/mainUserId"
+                                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/mainUserIdRest"
+                                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>
+
+                        <CheckBox
+                            android:id="@+id/sign"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dip"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/label_selectPublicKeys"
+                            android:text="@string/label_selectPublicKeys"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="0dip"
+                            android:layout_weight="1"
+                            android:layout_gravity="center_vertical"/>
+
+                        <Button
+                            android:text="@string/btn_selectEncryptKeys"
+                            android:id="@+id/btn_selectEncryptKeys"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"/>
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TableLayout
+                    android:id="@+id/modeSymmetric"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    android:stretchColumns="1">
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_passPhrase"
+                            android:text="@string/label_passPhrase"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/passPhrase"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                    <TableRow>
+
+                        <TextView
+                            android:id="@+id/label_passPhraseAgain"
+                            android:text="@string/label_passPhraseAgain"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:paddingRight="10dip"/>
+
+                        <EditText
+                            android:id="@+id/passPhraseAgain"
+                            android:layout_height="wrap_content"
+                            android:layout_width="fill_parent"
+                            android:inputType="textPassword"/>
+
+                    </TableRow>
+
+                </TableLayout>
+
+            </ViewFlipper>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="5dip"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/ButtonBar">
+
+        <Button
+            android:id="@+id/btn_encryptToClipboard"
+            android:text="@string/btn_encryptToClipboard"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+        <Button
+            android:id="@+id/btn_encrypt"
+            android:text="@string/btn_encrypt"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>

res/layout/encrypt_message.xml

@@ -1,95 +0,0 @@
-<?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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fillViewport="true">
-
-<EditText
-    android:id="@+id/message"
-    android:layout_width="fill_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1"
-    android:gravity="top"
-    android:inputType="text|textCapSentences|textMultiLine|textLongMessage">
-</EditText>
-
-<LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent" android:paddingBottom="3dip">
-
-<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_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>
-
-<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">
-</TextView>
-
-</LinearLayout>
-</LinearLayout>
-
-<LinearLayout
-   android:orientation="horizontal"
-   android:layout_width="fill_parent"
-   android:layout_height="wrap_content"
-   style="@android:style/ButtonBar">
-
-<Button
-    android:text="@string/btn_selectEncryptKeys"
-    android:id="@+id/btn_selectEncryptKeys"
-    android:layout_weight="1"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"/>
-
-<Button
-    android:id="@+id/btn_send"
-    android:text="@string/btn_send"
-    android:layout_weight="1"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"/>
-
-</LinearLayout>
-
-</LinearLayout>
-
-

res/layout/file_dialog.xml

@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingLeft="5dip"
+    android:paddingRight="5dip">
+
+    <EditText
+        android:id="@+id/input"
+        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>

res/layout/info.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:fillViewport="true"
+    android:padding="5dip">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textColor="#ffffffff"
+        android:autoLink="all"/>
+</ScrollView>

res/layout/key_list.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fillViewport="true">
+
+    <ExpandableListView
+        android:id="@+id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+</ScrollView>

res/layout/key_list_child_item_master_key.xml

@@ -19,54 +19,62 @@
     android:singleLine="true"
     android:paddingLeft="10dip"
     android:layout_marginRight="?android:attr/scrollbarSize"
-    android:layout_height="?android:attr/listPreferredItemHeight" android:layout_width="fill_parent">
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_width="fill_parent">
 
-<LinearLayout
+    <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="horizontal"
         android:paddingRight="3dip">
 
-<ImageView
+        <ImageView
-    android:id="@+id/ic_master_key"
+            android:id="@+id/ic_masterKey"
             android:src="@drawable/key_small"
             android:paddingRight="6dip"
             android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:layout_gravity="center_vertical"/>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"/>
 
-<TextView
+        <TextView
-    android:id="@+id/key_id"
+            android:id="@+id/keyId"
             android:text="Key ID"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>
+            android:layout_height="wrap_content"
+            android:paddingRight="5dip"
+            android:typeface="monospace"/>
 
-<TextView
+        <TextView
-    android:id="@+id/key_details"
+            android:id="@+id/keyDetails"
             android:text="(RSA, 1024bit)"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-
+        <LinearLayout
-<LinearLayout
             android:gravity="right"
             android:orientation="horizontal"
-    android:layout_width="fill_parent" android:paddingBottom="2dip" android:paddingTop="2dip" android:layout_height="fill_parent" android:layout_gravity="center_vertical">
+            android:paddingBottom="2dip"
+            android:paddingTop="2dip"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_vertical">
 
-<ImageView
+            <ImageView
-    android:id="@+id/ic_encrypt_key"
+                android:id="@+id/ic_encryptKey"
                 android:src="@drawable/encrypted_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-<ImageView
+            <ImageView
-    android:id="@+id/ic_sign_key"
+                android:id="@+id/ic_signKey"
                 android:src="@drawable/signed_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-</LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
-</LinearLayout>

res/layout/key_list_child_item_sub_key.xml

@@ -22,28 +22,29 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="fill_parent">
 
-<LinearLayout
+    <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="horizontal"
         android:paddingRight="3dip">
 
-<TextView
+        <TextView
-    android:id="@+id/key_id"
+            android:id="@+id/keyId"
             android:text="Key ID"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-    android:layout_height="wrap_content" android:paddingRight="5dip" android:typeface="monospace"/>
+            android:layout_height="wrap_content"
+            android:paddingRight="5dip"
+            android:typeface="monospace"/>
 
-<TextView
+        <TextView
-    android:id="@+id/key_details"
+            android:id="@+id/keyDetails"
             android:text="(RSA, 1024bit)"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-
+        <LinearLayout
-<LinearLayout
             android:gravity="right"
             android:orientation="horizontal"
             android:layout_width="fill_parent"
@@ -52,19 +53,20 @@
             android:paddingTop="2dip"
             android:layout_gravity="center_vertical">
 
-<ImageView
+            <ImageView
-    android:id="@+id/ic_encrypt_key"
+                android:id="@+id/ic_encryptKey"
                 android:src="@drawable/encrypted_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-<ImageView
+            <ImageView
-    android:id="@+id/ic_sign_key"
+                android:id="@+id/ic_signKey"
                 android:src="@drawable/signed_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
-</LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>
-</LinearLayout>

res/layout/key_list_child_item_user_id.xml

@@ -22,8 +22,8 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-<TextView
+    <TextView
-    android:id="@+id/user_id"
+        android:id="@+id/userId"
         android:text="User ID"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"

res/layout/key_list_group_item.xml

@@ -21,32 +21,33 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-<LinearLayout
+    <LinearLayout
         android:orientation="vertical"
         android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:paddingLeft="36dip">
+        android:layout_height="wrap_content"
+        android:paddingLeft="36dip">
 
-<TextView
+        <TextView
-    android:id="@+id/main_user_id"
+            android:id="@+id/mainUserId"
             android:text="Main User ID"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-<TextView
+        <TextView
-    android:id="@+id/main_user_id_rest"
+            android:id="@+id/mainUserIdRest"
             android:text="&lt;user@somewhere.com&gt;"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-</LinearLayout>
+    </LinearLayout>
 
-<LinearLayout
+    <LinearLayout
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
-</LinearLayout>
+    </LinearLayout>
 
 </LinearLayout>