diff options
Diffstat (limited to 'OpenPGP-Keychain/res/layout')
27 files changed, 237 insertions, 438 deletions
diff --git a/OpenPGP-Keychain/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key_dialog.xml index 888f9f898..a2e908433 100644 --- a/OpenPGP-Keychain/res/layout/create_key.xml +++ b/OpenPGP-Keychain/res/layout/create_key_dialog.xml @@ -1,26 +1,10 @@ <?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:layout_width="match_parent" + android:layout_height="match_parent" > <TableLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -44,7 +28,7 @@ <Spinner android:id="@+id/create_key_algorithm" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="4dp" /> </TableRow> @@ -60,7 +44,7 @@ <Spinner android:id="@+id/create_key_size" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="right" android:padding="4dp" /> diff --git a/OpenPGP-Keychain/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt_activity.xml index 9d9e1a1e8..9d9e1a1e8 100644 --- a/OpenPGP-Keychain/res/layout/decrypt.xml +++ b/OpenPGP-Keychain/res/layout/decrypt_activity.xml diff --git a/OpenPGP-Keychain/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/res/layout/drawer_list_item.xml index 0d4b9537e..14760e79d 100644 --- a/OpenPGP-Keychain/res/layout/drawer_list_item.xml +++ b/OpenPGP-Keychain/res/layout/drawer_list_item.xml @@ -25,16 +25,4 @@ android:textAppearance="@android:style/TextAppearance.Medium" android:textColor="#111" /> -</LinearLayout><!-- -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/text1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceListItemSmall" - android:gravity="center_vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:textColor="#fff" - android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeightSmall"/> ---> +</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key_activity.xml index f8597b0df..f8597b0df 100644 --- a/OpenPGP-Keychain/res/layout/edit_key.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_activity.xml diff --git a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml index 06bff2f9e..11bce64ee 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -1,20 +1,4 @@ <?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. ---> - <org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" diff --git a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml index 74f929bf6..663949d8e 100644 --- a/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -12,7 +12,7 @@ android:text="@string/label_main_user_id" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -33,7 +33,7 @@ <EditText android:id="@+id/name" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textPersonName|textCapWords" /> @@ -51,7 +51,7 @@ <EditText android:id="@+id/email" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textEmailAddress" /> @@ -69,7 +69,7 @@ <EditText android:id="@+id/comment" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" /> </TableRow> @@ -91,7 +91,7 @@ <View android:id="@+id/separator" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt_activity.xml index eea484df2..eea484df2 100644 --- a/OpenPGP-Keychain/res/layout/encrypt.xml +++ b/OpenPGP-Keychain/res/layout/encrypt_activity.xml diff --git a/OpenPGP-Keychain/res/layout/fragment_planet.xml b/OpenPGP-Keychain/res/layout/fragment_planet.xml deleted file mode 100644 index 4fe5bbe61..000000000 --- a/OpenPGP-Keychain/res/layout/fragment_planet.xml +++ /dev/null @@ -1,23 +0,0 @@ -<!-- - Copyright 2013 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. - --> - -<ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/image" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#000000" - android:gravity="center" - android:padding="32dp" /> diff --git a/OpenPGP-Keychain/res/layout/help_fragment_about.xml b/OpenPGP-Keychain/res/layout/help_about_fragment.xml index 71788e720..71788e720 100644 --- a/OpenPGP-Keychain/res/layout/help_fragment_about.xml +++ b/OpenPGP-Keychain/res/layout/help_about_fragment.xml diff --git a/OpenPGP-Keychain/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys_activity.xml index c2217d2ec..c2217d2ec 100644 --- a/OpenPGP-Keychain/res/layout/import_keys.xml +++ b/OpenPGP-Keychain/res/layout/import_keys_activity.xml diff --git a/OpenPGP-Keychain/res/layout/key_list_child_item.xml b/OpenPGP-Keychain/res/layout/key_list_child_item.xml deleted file mode 100644 index 81d843529..000000000 --- a/OpenPGP-Keychain/res/layout/key_list_child_item.xml +++ /dev/null @@ -1,102 +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:layout_width="fill_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" - android:orientation="vertical" - android:singleLine="true" > - - <LinearLayout - android:id="@+id/keyLayout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="8dip" - android:paddingRight="3dip" > - - <ImageView - android:id="@+id/ic_masterKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="6dip" - android:src="@drawable/key_small" /> - - <TextView - android:id="@+id/keyId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="Key ID" - android:textAppearance="?android:attr/textAppearanceMedium" - android:typeface="monospace" /> - - <TextView - android:id="@+id/keyDetails" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="(RSA, 1024bit)" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center_vertical" - android:gravity="right" - android:orientation="horizontal" - android:paddingBottom="2dip" - android:paddingTop="2dip" > - - <ImageView - android:id="@+id/ic_certifyKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/certify_small" /> - - <ImageView - android:id="@+id/ic_encryptKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/encrypted_small" /> - - <ImageView - android:id="@+id/ic_signKey" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/signed_small" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/userIdLayout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="36dip" - android:singleLine="true" > - - <TextView - android:id="@+id/userId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="3dip" - android:text="User ID" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/stickylist_header.xml b/OpenPGP-Keychain/res/layout/key_list_public_header.xml index 5768e4153..5768e4153 100644 --- a/OpenPGP-Keychain/res/layout/stickylist_header.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_header.xml diff --git a/OpenPGP-Keychain/res/layout/key_server_export.xml b/OpenPGP-Keychain/res/layout/key_server_export.xml new file mode 100644 index 000000000..30e4e0644 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/key_server_export.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <Spinner + android:id="@+id/keyServer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <Button + android:id="@+id/btn_export_to_server" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/btn_export_to_server" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_export_layout.xml b/OpenPGP-Keychain/res/layout/key_server_export_layout.xml deleted file mode 100644 index 257f087ee..000000000 --- a/OpenPGP-Keychain/res/layout/key_server_export_layout.xml +++ /dev/null @@ -1,34 +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:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <Spinner - android:id="@+id/keyServer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <Button - android:id="@+id/btn_export_to_server" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/btn_export_to_server" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_query_layout.xml b/OpenPGP-Keychain/res/layout/key_server_query.xml index 5eca10c45..20f260a95 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_layout.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query.xml @@ -1,32 +1,16 @@ <?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:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" > <Spinner android:id="@+id/keyServer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" /> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -49,7 +33,7 @@ <ListView android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" /> diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml index 29c8b88f4..6d883d26d 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml @@ -1,97 +1,77 @@ <?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:singleLine="true" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" android:paddingLeft="3dip" android:paddingRight="?android:attr/scrollbarSize" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:orientation="vertical"> + android:singleLine="true" > <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > <LinearLayout - android:orientation="vertical" - android:paddingLeft="5dip" - android:paddingRight="5dip" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_weight="1"> + android:layout_weight="1" + android:orientation="vertical" + android:paddingLeft="5dip" + 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_height="wrap_content" + android:text="Main User ID" + android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView android:id="@+id/mainUserIdRest" - android:text="<user@somewhere.com>" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" + android:text="<user@somewhere.com>" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <LinearLayout - android:orientation="vertical" - android:minWidth="90dip" - android:paddingLeft="3dip" - android:gravity="right" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:gravity="right" + android:minWidth="90dip" + android:orientation="vertical" + android:paddingLeft="3dip" > <TextView android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="match_parent" android:text="BBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" - android:typeface="monospace" - android:layout_width="wrap_content" - android:layout_height="fill_parent"/> + android:typeface="monospace" /> <TextView android:id="@+id/algorithm" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView android:id="@+id/status" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#e00"/> - + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#e00" /> </LinearLayout> - </LinearLayout> <LinearLayout android:id="@+id/list" - android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="30dip"> - + android:layout_marginLeft="30dip" + android:orientation="vertical" > </LinearLayout> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml index 9d3a4a1ab..c69735e67 100644 --- a/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml +++ b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml @@ -1,26 +1,10 @@ <?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. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_marginRight="?android:attr/scrollbarSize" - android:singleLine="true" +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:paddingRight="3dip"> + android:layout_marginRight="?android:attr/scrollbarSize" + android:paddingRight="3dip" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" > -</TextView> +</TextView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/lists_activity.xml b/OpenPGP-Keychain/res/layout/lists_activity.xml deleted file mode 100644 index 58b0906d3..000000000 --- a/OpenPGP-Keychain/res/layout/lists_activity.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <LinearLayout - android:id="@+id/lists_tabs_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase.xml b/OpenPGP-Keychain/res/layout/passphrase.xml deleted file mode 100644 index 778ae6b80..000000000 --- a/OpenPGP-Keychain/res/layout/passphrase.xml +++ /dev/null @@ -1,40 +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:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" > - - <TextView - android:id="@+id/passphrase_label_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="@string/label_passphrase" /> - - <EditText - android:id="@+id/passphrase_passphrase" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:inputType="textPassword" - android:padding="4dp" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase_dialog.xml b/OpenPGP-Keychain/res/layout/passphrase_dialog.xml new file mode 100644 index 000000000..4b331f0f2 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/passphrase_dialog.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" > + + <TextView + android:id="@+id/passphrase_label_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_passphrase" /> + + <EditText + android:id="@+id/passphrase_passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:padding="4dp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml b/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml index 1eef4eb68..2bdd231ee 100644 --- a/OpenPGP-Keychain/res/layout/passphrase_repeat.xml +++ b/OpenPGP-Keychain/res/layout/passphrase_repeat_dialog.xml @@ -1,22 +1,6 @@ <?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. ---> - <TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -34,7 +18,7 @@ <EditText android:id="@+id/passphrase_passphrase" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" android:padding="4dp" /> @@ -52,7 +36,7 @@ <EditText android:id="@+id/passphrase_passphrase_again" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionDone" android:inputType="textPassword" diff --git a/OpenPGP-Keychain/res/layout/share_nfc_beam.xml b/OpenPGP-Keychain/res/layout/share_nfc_beam.xml deleted file mode 100644 index 692f53e4e..000000000 --- a/OpenPGP-Keychain/res/layout/share_nfc_beam.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <org.sufficientlysecure.htmltextview.HtmlTextView - android:id="@+id/nfc_beam_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="16dp" - android:text="" /> - -</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/res/layout/sign_key_activity.xml new file mode 100644 index 000000000..b9f66db7f --- /dev/null +++ b/OpenPGP-Keychain/res/layout/sign_key_activity.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/textView1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_send_key" + android:textAppearance="?android:attr/textAppearanceMedium" > + </TextView> + + <CheckBox + android:id="@+id/sendKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" + android:text="" > + </CheckBox> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <Spinner + android:id="@+id/keyServer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" /> + </LinearLayout> + + <Button + android:id="@+id/sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/btn_sign" > + </Button> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/sign_key_layout.xml b/OpenPGP-Keychain/res/layout/sign_key_layout.xml deleted file mode 100644 index 4530831ee..000000000 --- a/OpenPGP-Keychain/res/layout/sign_key_layout.xml +++ /dev/null @@ -1,40 +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: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"> - </LinearLayout> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:orientation="horizontal"> - - <TextView android:id="@+id/textView1" android:layout_height="wrap_content" - android:text="@string/label_send_key" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content"></TextView> - <CheckBox android:text="" android:id="@+id/sendKey" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:checked="true"></CheckBox> - </LinearLayout> - - <LinearLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" android:orientation="horizontal"> - - <Spinner android:id="@+id/keyServer" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_weight="1" /> - </LinearLayout> - - <Button android:layout_height="wrap_content" - android:layout_width="wrap_content" android:text="@string/btn_sign" - android:id="@+id/sign"></Button> - -</LinearLayout> diff --git a/OpenPGP-Keychain/res/layout/key_view_activity.xml b/OpenPGP-Keychain/res/layout/view_key_activity.xml index ffb2400f1..ffb2400f1 100644 --- a/OpenPGP-Keychain/res/layout/key_view_activity.xml +++ b/OpenPGP-Keychain/res/layout/view_key_activity.xml diff --git a/OpenPGP-Keychain/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/res/layout/view_key_keys_item.xml new file mode 100644 index 000000000..b50253980 --- /dev/null +++ b/OpenPGP-Keychain/res/layout/view_key_keys_item.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginRight="?android:attr/scrollbarSize" + android:orientation="horizontal" + android:paddingLeft="8dip" + android:paddingRight="3dip" + android:singleLine="true" > + + <ImageView + android:id="@+id/ic_masterKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="6dip" + android:src="@drawable/key_small" /> + + <TextView + android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="Key ID" + android:textAppearance="?android:attr/textAppearanceMedium" + android:typeface="monospace" /> + + <TextView + android:id="@+id/keyDetails" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="(RSA, 1024bit)" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:gravity="right" + android:orientation="horizontal" + android:paddingBottom="2dip" + android:paddingTop="2dip" > + + <ImageView + android:id="@+id/ic_certifyKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/certify_small" /> + + <ImageView + android:id="@+id/ic_encryptKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/encrypted_small" /> + + <ImageView + android:id="@+id/ic_signKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/signed_small" /> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/res/layout/view_key_userids_item.xml new file mode 100644 index 000000000..cbc85189f --- /dev/null +++ b/OpenPGP-Keychain/res/layout/view_key_userids_item.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginRight="?android:attr/scrollbarSize" + android:orientation="vertical" + android:paddingLeft="36dip" + android:singleLine="true" > + + <TextView + android:id="@+id/userId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="3dip" + android:text="User ID" + android:textAppearance="?android:attr/textAppearanceSmall" /> + +</LinearLayout>
\ No newline at end of file |