diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
7 files changed, 28 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 76ba183b7..3ad087da3 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - <org.sufficientlysecure.keychain.util.SlidingTabLayout + <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/sliding_tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index f43aade25..5aa1cd167 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -35,7 +35,7 @@ android:visibility="gone" android:id="@+id/status_divider" /> - <org.sufficientlysecure.keychain.util.SlidingTabLayout + <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 864016801..64877d725 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -31,4 +31,10 @@ app:showAsAction="never" android:title="@string/menu_delete_key" /> + <item + android:id="@+id/menu_key_view_advanced" + app:showAsAction="never" + android:checkable="true" + android:title="@string/menu_advanced" /> + </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index b415c6d42..5a2c38419 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -103,6 +103,7 @@ <string name="menu_select_all">Select all</string> <string name="menu_add_keys">Add keys</string> <string name="menu_export_all_keys">Export all keys</string> + <string name="menu_advanced">Show advanced info</string> <!-- label --> <string name="label_sign">Sign</string> @@ -609,5 +610,7 @@ <string name="can_sign_not">cannot sign</string> <string name="error_encoding">Encoding error</string> <string name="error_no_encrypt_subkey">No encryption subkey available!</string> + <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string> + <string name="contact_show_key">Show key (%s)</string> </resources> diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml new file mode 100644 index 000000000..94ffdf40b --- /dev/null +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> + +<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" + android:accountType="org.sufficientlysecure.keychain" + android:icon="@drawable/icon" + android:label="@string/app_name"/> diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml new file mode 100644 index 000000000..5f5f2be80 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android"> + <ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key" + android:detailColumn="data1"/> +</ContactsSource>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml new file mode 100644 index 000000000..d8fe60e91 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" + android:contentAuthority="com.android.contacts" + android:accountType="org.sufficientlysecure.keychain" + android:supportsUploading="false" + android:userVisible="true"/>
\ No newline at end of file |