diff options
Diffstat (limited to 'org_apg/res')
39 files changed, 173 insertions, 347 deletions
diff --git a/org_apg/res/drawable-hdpi/create_contact.png b/org_apg/res/drawable-hdpi/create_contact.png Binary files differnew file mode 100644 index 000000000..7a29b65b1 --- /dev/null +++ b/org_apg/res/drawable-hdpi/create_contact.png diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png b/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png Binary files differnew file mode 100644 index 000000000..0d51bcb68 --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_decrypt_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png b/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png Binary files differnew file mode 100644 index 000000000..d4cc0f8ea --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_decrypt_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png b/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png Binary files differnew file mode 100644 index 000000000..07617bb9d --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_encrypt_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png b/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png Binary files differnew file mode 100644 index 000000000..b8fe6e1d6 --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_encrypt_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_help_pressed.png b/org_apg/res/drawable-hdpi/dashboard_help_pressed.png Binary files differindex 4a19c1472..dad8694f8 100644 --- a/org_apg/res/drawable-hdpi/dashboard_help_pressed.png +++ b/org_apg/res/drawable-hdpi/dashboard_help_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png Binary files differindex b1514d9d4..a86bc1bf9 100644 --- a/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png +++ b/org_apg/res/drawable-hdpi/dashboard_manage_keys_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png b/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png Binary files differindex e24f5c207..6a5c92138 100644 --- a/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png +++ b/org_apg/res/drawable-hdpi/dashboard_my_keys_pressed.png diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png Binary files differnew file mode 100644 index 000000000..65323e3d0 --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_default.png diff --git a/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png Binary files differnew file mode 100644 index 000000000..65323e3d0 --- /dev/null +++ b/org_apg/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_find_holo_light.png b/org_apg/res/drawable-hdpi/ic_menu_find_holo_light.png Binary files differnew file mode 100644 index 000000000..efee6dfd2 --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_menu_find_holo_light.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_search_holo_light.png b/org_apg/res/drawable-hdpi/ic_menu_search_holo_light.png Binary files differnew file mode 100644 index 000000000..1cb61faf4 --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_menu_search_holo_light.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_settings_holo_light.png b/org_apg/res/drawable-hdpi/ic_menu_settings_holo_light.png Binary files differnew file mode 100644 index 000000000..577e05587 --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_menu_settings_holo_light.png diff --git a/org_apg/res/drawable-hdpi/ic_menu_share_holo_light.png b/org_apg/res/drawable-hdpi/ic_menu_share_holo_light.png Binary files differnew file mode 100644 index 000000000..682b2fdec --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_menu_share_holo_light.png diff --git a/org_apg/res/drawable-hdpi/ic_suggestions_add.png b/org_apg/res/drawable-hdpi/ic_suggestions_add.png Binary files differnew file mode 100644 index 000000000..919872c1e --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_suggestions_add.png diff --git a/org_apg/res/drawable-hdpi/ic_suggestions_delete.png b/org_apg/res/drawable-hdpi/ic_suggestions_delete.png Binary files differnew file mode 100644 index 000000000..fa42db094 --- /dev/null +++ b/org_apg/res/drawable-hdpi/ic_suggestions_delete.png diff --git a/org_apg/res/drawable-mdpi/create_contact.png b/org_apg/res/drawable-mdpi/create_contact.png Binary files differnew file mode 100644 index 000000000..5a9360b27 --- /dev/null +++ b/org_apg/res/drawable-mdpi/create_contact.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_find_holo_light.png b/org_apg/res/drawable-mdpi/ic_menu_find_holo_light.png Binary files differnew file mode 100644 index 000000000..9033f1ec2 --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_menu_find_holo_light.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_search_holo_light.png b/org_apg/res/drawable-mdpi/ic_menu_search_holo_light.png Binary files differnew file mode 100644 index 000000000..2369d03f3 --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_menu_search_holo_light.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_settings_holo_light.png b/org_apg/res/drawable-mdpi/ic_menu_settings_holo_light.png Binary files differnew file mode 100644 index 000000000..f32a37e44 --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_menu_settings_holo_light.png diff --git a/org_apg/res/drawable-mdpi/ic_menu_share_holo_light.png b/org_apg/res/drawable-mdpi/ic_menu_share_holo_light.png Binary files differnew file mode 100644 index 000000000..70fe31aa2 --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_menu_share_holo_light.png diff --git a/org_apg/res/drawable-mdpi/ic_suggestions_add.png b/org_apg/res/drawable-mdpi/ic_suggestions_add.png Binary files differnew file mode 100644 index 000000000..e98bdf8f0 --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_suggestions_add.png diff --git a/org_apg/res/drawable-mdpi/ic_suggestions_delete.png b/org_apg/res/drawable-mdpi/ic_suggestions_delete.png Binary files differnew file mode 100644 index 000000000..78e6ec18e --- /dev/null +++ b/org_apg/res/drawable-mdpi/ic_suggestions_delete.png diff --git a/org_apg/res/drawable-xhdpi/create_contact.png b/org_apg/res/drawable-xhdpi/create_contact.png Binary files differnew file mode 100644 index 000000000..c6d562255 --- /dev/null +++ b/org_apg/res/drawable-xhdpi/create_contact.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_find_holo_light.png b/org_apg/res/drawable-xhdpi/ic_menu_find_holo_light.png Binary files differnew file mode 100644 index 000000000..de20fa0e7 --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_menu_find_holo_light.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_search_holo_light.png b/org_apg/res/drawable-xhdpi/ic_menu_search_holo_light.png Binary files differnew file mode 100644 index 000000000..578cb24eb --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_menu_search_holo_light.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_settings_holo_light.png b/org_apg/res/drawable-xhdpi/ic_menu_settings_holo_light.png Binary files differnew file mode 100644 index 000000000..aa33c3880 --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_menu_settings_holo_light.png diff --git a/org_apg/res/drawable-xhdpi/ic_menu_share_holo_light.png b/org_apg/res/drawable-xhdpi/ic_menu_share_holo_light.png Binary files differnew file mode 100644 index 000000000..528e554ab --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_menu_share_holo_light.png diff --git a/org_apg/res/drawable-xhdpi/ic_suggestions_add.png b/org_apg/res/drawable-xhdpi/ic_suggestions_add.png Binary files differnew file mode 100644 index 000000000..b1edef7ea --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_suggestions_add.png diff --git a/org_apg/res/drawable-xhdpi/ic_suggestions_delete.png b/org_apg/res/drawable-xhdpi/ic_suggestions_delete.png Binary files differnew file mode 100644 index 000000000..6b1f44754 --- /dev/null +++ b/org_apg/res/drawable-xhdpi/ic_suggestions_delete.png diff --git a/org_apg/res/drawable/dashboard_encrypt_decrypt_file.xml b/org_apg/res/drawable/dashboard_decrypt.xml index cd49de477..981e38a0b 100644 --- a/org_apg/res/drawable/dashboard_encrypt_decrypt_file.xml +++ b/org_apg/res/drawable/dashboard_decrypt.xml @@ -14,15 +14,15 @@ limitations under the License. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_file_pressed" + <item android:drawable="@drawable/dashboard_decrypt_pressed" android:state_focused="true" android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_file_pressed" + <item android:drawable="@drawable/dashboard_decrypt_pressed" android:state_focused="false" android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_file_pressed" + <item android:drawable="@drawable/dashboard_decrypt_pressed" android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_file_default" + <item android:drawable="@drawable/dashboard_decrypt_default" android:state_focused="false" android:state_pressed="false" /> </selector> diff --git a/org_apg/res/drawable/dashboard_encrypt_decrypt_text.xml b/org_apg/res/drawable/dashboard_encrypt.xml index 61c0ebc89..af812dc51 100644 --- a/org_apg/res/drawable/dashboard_encrypt_decrypt_text.xml +++ b/org_apg/res/drawable/dashboard_encrypt.xml @@ -14,15 +14,15 @@ limitations under the License. --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_text_pressed" + <item android:drawable="@drawable/dashboard_encrypt_pressed" android:state_focused="true" android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_text_pressed" + <item android:drawable="@drawable/dashboard_encrypt_pressed" android:state_focused="false" android:state_pressed="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_text_pressed" + <item android:drawable="@drawable/dashboard_encrypt_pressed" android:state_focused="true" /> - <item android:drawable="@drawable/dashboard_encrypt_decrypt_text_default" + <item android:drawable="@drawable/dashboard_encrypt_default" android:state_focused="false" android:state_pressed="false" /> </selector> diff --git a/org_apg/res/drawable/dashboard_scan_qrcode.xml b/org_apg/res/drawable/dashboard_scan_qrcode.xml new file mode 100644 index 000000000..400994820 --- /dev/null +++ b/org_apg/res/drawable/dashboard_scan_qrcode.xml @@ -0,0 +1,28 @@ +<!-- + Copyright 2011 Google Inc. + + 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. + --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/dashboard_scan_qrcode_pressed" + android:state_focused="true" + android:state_pressed="true" /> + <item android:drawable="@drawable/dashboard_scan_qrcode_pressed" + android:state_focused="false" + android:state_pressed="true" /> + <item android:drawable="@drawable/dashboard_scan_qrcode_pressed" + android:state_focused="true" /> + <item android:drawable="@drawable/dashboard_scan_qrcode_default" + android:state_focused="false" + android:state_pressed="false" /> +</selector> diff --git a/org_apg/res/layout/about_activity.xml b/org_apg/res/layout/about_activity.xml index a85439ee1..c523f3e76 100644 --- a/org_apg/res/layout/about_activity.xml +++ b/org_apg/res/layout/about_activity.xml @@ -8,9 +8,7 @@ android:layout_height="wrap_content" android:isScrollContainer="true" android:orientation="vertical" - android:paddingBottom="15dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" + android:padding="15dp" android:scrollbars="vertical" > <LinearLayout diff --git a/org_apg/res/layout/encrypt.xml b/org_apg/res/layout/encrypt.xml index 68808c8bf..0862e4475 100644 --- a/org_apg/res/layout/encrypt.xml +++ b/org_apg/res/layout/encrypt.xml @@ -1,382 +1,348 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- 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. --> - 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" +<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"> + android:paddingTop="5dip" > <ScrollView android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" - android:fillViewport="true"> + android:fillViewport="true" + android:padding="10dip" > <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" - android:layout_marginLeft="5dip"> + android:layout_marginLeft="5dip" + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" > <ImageView android:id="@+id/sourcePrevious" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_previous"/> + 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"/> + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium" /> <ImageView android:id="@+id/sourceNext" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_next"/> - + android:src="@drawable/ic_next" /> </LinearLayout> <ViewFlipper android:id="@+id/source" android:layout_width="fill_parent" android:layout_height="0dip" - android:layout_weight="1"> + android:layout_weight="1" > <LinearLayout android:id="@+id/sourceMessage" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> + 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"/> - + 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"> + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" > <EditText android:id="@+id/filename" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_weight="1"/> + android:layout_weight="1" /> <ImageButton android:id="@+id/btn_browse" - android:src="@drawable/ic_launcher_folder_small" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_width="wrap_content"/> - + android:src="@drawable/ic_launcher_folder_small" /> </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"/> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/label_fileCompression" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_fileCompression" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <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"> + android:orientation="horizontal" > <TextView android:id="@+id/label_deleteAfterEncryption" - android:text="@string/label_deleteAfterEncryption" - android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_weight="1" android:paddingRight="10dip" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1"/> + android:text="@string/label_deleteAfterEncryption" + android:textAppearance="?android:attr/textAppearanceMedium" /> <CheckBox android:id="@+id/deleteAfterEncryption" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="center_vertical"/> - + 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"> + android:orientation="horizontal" > <TextView android:id="@+id/label_asciiArmour" - android:text="@string/label_asciiArmour" - android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_weight="1" android:paddingRight="10dip" - android:layout_height="wrap_content" - android:layout_width="0dip" - android:layout_weight="1"/> + android:text="@string/label_asciiArmour" + android:textAppearance="?android:attr/textAppearanceMedium" /> <CheckBox android:id="@+id/asciiArmour" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="center_vertical"/> - + android:layout_height="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"/> + android:layout_marginBottom="5dip" + android:background="?android:attr/listDivider" /> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" > <ImageView android:id="@+id/modePrevious" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_previous"/> + 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"/> + android:text="@string/label_asymmetric" + android:textAppearance="?android:attr/textAppearanceMedium" /> <ImageView android:id="@+id/modeNext" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_next"/> - + android:src="@drawable/ic_next" /> </LinearLayout> <ViewFlipper android:id="@+id/mode" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" > <LinearLayout android:id="@+id/modeAsymmetric" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" > <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + 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"/> + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="@string/label_sign" + android:textAppearance="?android:attr/textAppearanceMedium" /> <LinearLayout - android:orientation="vertical" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="5dip"> + android:orientation="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"/> + android:layout_gravity="right" + android:text="Main User Id" + android:textAppearance="?android:attr/textAppearanceMedium" /> <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"/> - + android:layout_gravity="right" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <CheckBox android:id="@+id/sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical"/> - + android:layout_gravity="center_vertical" /> </LinearLayout> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingBottom="3dip" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingBottom="3dip" > <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_height="wrap_content" + android:layout_gravity="center_vertical" android:layout_weight="1" - android:layout_gravity="center_vertical"/> + android:text="@string/label_selectPublicKeys" + android:textAppearance="?android:attr/textAppearanceMedium" /> <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"/> - + android:layout_gravity="center_vertical" + android:text="@string/btn_selectEncryptKeys" /> </LinearLayout> </LinearLayout> <TableLayout android:id="@+id/modeSymmetric" - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:stretchColumns="1"> + android:layout_height="wrap_content" + 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_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_passPhrase" + android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText android:id="@+id/passPhrase" - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:inputType="textPassword"/> - + android:layout_height="wrap_content" + 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_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip"/> + android:paddingRight="10dip" + android:text="@string/label_passPhraseAgain" + android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText android:id="@+id/passPhraseAgain" - android:layout_height="wrap_content" android:layout_width="fill_parent" - android:inputType="textPassword"/> - + android:layout_height="wrap_content" + 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"/> - + android:layout_marginBottom="5dip" + android:background="?android:attr/listDivider" /> </LinearLayout> - </ScrollView> <LinearLayout - android:orientation="horizontal" + style="@android:style/ButtonBar" android:layout_width="fill_parent" android:layout_height="wrap_content" - style="@android:style/ButtonBar"> + android:orientation="horizontal" > <Button android:id="@+id/btn_encryptToClipboard" - android:text="@string/btn_encryptToClipboard" - android:layout_weight="1" android:layout_width="0dip" - android:layout_height="fill_parent"/> + android:layout_height="fill_parent" + android:layout_weight="1" + android:text="@string/btn_encryptToClipboard" /> <Button android:id="@+id/btn_encrypt" - android:text="@string/btn_encrypt" - android:layout_weight="1" android:layout_width="0dip" - android:layout_height="fill_parent"/> - + android:layout_height="fill_parent" + android:layout_weight="1" + android:text="@string/btn_encrypt" /> </LinearLayout> -</LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/org_apg/res/layout/main.xml b/org_apg/res/layout/main.xml index 86a582b7c..6f0a66a71 100644 --- a/org_apg/res/layout/main.xml +++ b/org_apg/res/layout/main.xml @@ -39,18 +39,26 @@ android:text="@string/dashboard_my_keys" /> <Button - android:id="@+id/dashboard_encrypt_decrypt_file" + android:id="@+id/dashboard_encrypt" style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_encrypt_decrypt_file" - android:onClick="encryptDecryptFileOnClick" - android:text="@string/dashboard_encrypt_decrypt_file" /> + android:drawableTop="@drawable/dashboard_encrypt" + android:onClick="encryptOnClick" + android:text="@string/dashboard_encrypt" /> <Button - android:id="@+id/dashboard_encrypt_decrypt_text" + android:id="@+id/dashboard_decrypt" style="@style/DashboardButton" - android:drawableTop="@drawable/dashboard_encrypt_decrypt_text" - android:onClick="encryptDecryptTextOnClick" - android:text="@string/dashboard_encrypt_decrypt_text" /> + android:drawableTop="@drawable/dashboard_decrypt" + android:onClick="decryptOnClick" + android:text="@string/dashboard_decrypt" /> + + + <Button + android:id="@+id/dashboard_scan_qrcode" + style="@style/DashboardButton" + android:drawableTop="@drawable/dashboard_scan_qrcode" + android:onClick="scanQrcodeOnClick" + android:text="@string/dashboard_scan_qrcode" /> <Button android:id="@+id/dashboard_help" diff --git a/org_apg/res/values/arrays.xml b/org_apg/res/values/arrays.xml index 25a4e66df..05320c609 100644 --- a/org_apg/res/values/arrays.xml +++ b/org_apg/res/values/arrays.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 Thialfihar <thi@thialfihar.org> +<!-- + 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. @@ -29,7 +30,6 @@ <item>@string/choice_4hours</item> <item>@string/choice_8hours</item> </string-array> - <string-array name="pass_phrase_cache_ttl_values"> <item>15</item> <item>60</item> @@ -44,171 +44,4 @@ <item>28800</item> </string-array> - <string-array name="language_entries"> - <item>@string/choice_language_system</item> - <item>Afrikaans</item> - <item>Bahasa indonesia</item> - <item>Bahasa melayu</item> - <item>Bamanankan</item> - <item>Català</item> - <item>Cymraeg</item> - <item>Dansk</item> - <item>Deutsch</item> - <item>Dholuo</item> - <item>Eesti</item> - <item>English</item> - <item>Español</item> - <item>Fulfulde, Pulaar, Pular</item> - <item>Gaeilge</item> - <item>Galego</item> - <item>Hausa</item> - <item>Hrvatski</item> - <item>Kinyarwanda</item> - <item>Kirundi</item> - <item>Kiswahili</item> - <item>Latviešu</item> - <item>Lietuviškai</item> - <item>Magyar</item> - <item>Malti</item> - <item>Nederlands</item> - <item>Norsk bokmål</item> - <item>Pyccĸий</item> - <item>Română</item> - <item>Slovenčina</item> - <item>Slovenščina</item> - <item>Somali</item> - <item>Српски</item> - <item>Tiếng Việt</item> - <item>Tϋrkçe</item> - <item>Wolof</item> - <item>Yorùbá</item> - <item>Azərbaycan</item> - <item>Euskera</item> - <item>Français</item> - <item>isiXhosa</item> - <item>isiZulu</item> - <item>Italiano</item> - <item>O\'zbek</item> - <item>Polski</item> - <item>Português</item> - <item>Shqip</item> - <item>Suomi</item> - <item>Svenska</item> - <item>Íslenska</item> - <item>Čeština</item> - <item>Ɛʋɛ</item> - <item>Ελληνικά</item> - <item>Беларуская</item> - <item>Български</item> - <item>Кыргыз</item> - <item>Македонски</item> - <item>Українська</item> - <item>аҧсуа бызшәа</item> - <item>Қазақ</item> - <item>Հայերեն</item> - <item>עברית</item> - <item>اردو</item> - <item>العربية</item> - <item>فارسی</item> - <item>پښتو</item> - <item>हिंदी</item> - <item>తెలుగు</item> - <item>ಕನ್ನಡ</item> - <item>ภาษาไทย</item> - <item>አማርኛ</item> - <item>中文</item> - <item>日本語</item> - <item>한국어</item> - </string-array> - - <string-array name="language_values"> - <item></item> - <item>af</item> - <item>id</item> - <item>ms</item> - <item>bm</item> - <item>ca</item> - <item>cy</item> - <item>da</item> - <item>de</item> - <item>luo</item> - <item>et</item> - <item>en</item> - <item>es</item> - <item>ff</item> - <item>ga</item> - <item>gl</item> - <item>ha</item> - <item>hr</item> - <item>rw</item> - <item>rn</item> - <item>sw</item> - <item>lv</item> - <item>lt</item> - <item>hu</item> - <item>mt</item> - <item>nl</item> - <item>no</item> - <item>ru</item> - <item>ro</item> - <item>sk</item> - <item>sl</item> - <item>so</item> - <item>sr</item> - <item>vi</item> - <item>tr</item> - <item>wo</item> - <item>yo</item> - <item>az</item> - <item>eu</item> - <item>fr</item> - <item>xs</item> - <item>zu</item> - <item>it</item> - <item>uz</item> - <item>pl</item> - <item>pt</item> - <item>sq</item> - <item>fi</item> - <item>sv</item> - <item>is</item> - <item>cs</item> - <item>ee</item> - <item>el</item> - <item>be</item> - <item>bg</item> - <item>ky</item> - <item>mk</item> - <item>uk</item> - <item>ab</item> - <item>kk</item> - <item>hy</item> - <item>he</item> - <item>ur</item> - <item>ar</item> - <item>fa</item> - <item>ps</item> - <item>hi</item> - <item>te</item> - <item>kn</item> - <item>th</item> - <item>am</item> - <item>zh</item> - <item>ja</item> - <item>ko</item> - </string-array> - - <string-array name="supported_languages"> - <item></item> - <item>da</item> - <item>de</item> - <item>en</item> - <item>es</item> - <item>it</item> - <item>no</item> - <item>pt</item> - <item>sl</item> - <item>zh</item> - </string-array> - -</resources> +</resources>
\ No newline at end of file diff --git a/org_apg/res/values/strings.xml b/org_apg/res/values/strings.xml index 23574f808..aa0a99a30 100644 --- a/org_apg/res/values/strings.xml +++ b/org_apg/res/values/strings.xml @@ -86,7 +86,7 @@ <string name="menu_manageSecretKeys">Manage Secret Keys</string> <string name="menu_preferences">Settings</string> <string name="menu_importKeys">Import Keys</string> - <string name="menu_exportKeys">Export Keys</string> + <string name="menu_exportKeys">Export All Keys</string> <string name="menu_exportKey">Export Key</string> <string name="menu_deleteKey">Delete Key</string> <string name="menu_createKey">Create Key</string> @@ -119,7 +119,6 @@ <string name="label_passPhraseCacheTtl">Pass Phrase Cache</string> <string name="label_messageCompression">Message Compression</string> <string name="label_fileCompression">File Compression</string> - <string name="label_language">Language</string> <string name="label_forceV3Signature">Force V3 Signatures</string> <string name="label_keyServers">Key Servers</string> <string name="label_keyId">Key ID</string> @@ -323,16 +322,17 @@ <!-- about --> - <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.</string> + <string name="about_description">Android Privacy Guard (APG) is a OpenPGP implementation for Android.\n\nAPG+ is a fork based on the original APG to introduce more features and a new user interface.</string> <string name="about_license">License: Apache License 2.0</string> <string name="about_version">Version:</string> - <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, send key, sign key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann</string> + <string name="about_developer">Developer: Thialfihar (Main developer), Senecaso (QRCode, sign key, upload key), Markus Doits (AIDL), Oliver Runge, Dominik Schürmann (APG+ fork)</string> <!-- Dashboard --> <string name="dashboard_manage_keys">Manage Keys</string> <string name="dashboard_my_keys">My Keys</string> - <string name="dashboard_encrypt_decrypt_file">Encrypt/Decrypt File</string> - <string name="dashboard_encrypt_decrypt_text">Encrypt/Decrypt Text</string> + <string name="dashboard_encrypt">Encrypt</string> + <string name="dashboard_decrypt">Decrypt</string> <string name="dashboard_help">Help</string> + <string name="dashboard_scan_qrcode">Scan QRCode</string> </resources>
\ No newline at end of file diff --git a/org_apg/res/xml/apg_preferences.xml b/org_apg/res/xml/apg_preferences.xml index 7c0dd2206..f32c2d73f 100644 --- a/org_apg/res/xml/apg_preferences.xml +++ b/org_apg/res/xml/apg_preferences.xml @@ -18,13 +18,6 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceCategory android:title="@string/section_general" > - <ListPreference - android:dialogTitle="@string/label_language" - android:entries="@array/language_entries" - android:entryValues="@array/language_values" - android:key="language" - android:title="@string/label_language" /> - <org.apg.ui.widget.IntegerListPreference android:entries="@array/pass_phrase_cache_ttl_entries" android:entryValues="@array/pass_phrase_cache_ttl_values" |
