diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-15 10:20:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-15 10:20:01 +0200 |
commit | 67e572cf4f65fa8e643825cd4ec75f03951a5dd7 (patch) | |
tree | 15e0b3cc73d8681036b82fab3b2599e79ce5cfb1 /OpenKeychain/src/main/res | |
parent | 53bc417f8f77a9f92786457281d02431ef614ca7 (diff) | |
parent | ba7ef28ade4161ebecf8db7271114d96d9ae0595 (diff) | |
download | open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.gz open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.tar.bz2 open-keychain-67e572cf4f65fa8e643825cd4ec75f03951a5dd7.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/drawable/button_rounded_blue.xml | 37 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml (renamed from OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml) | 27 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml | 32 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/import_keys_list_entry.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/key_server_preference.xml | 23 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 15 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/adv_preferences.xml | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/cloud_search_prefs.xml | 20 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/gen_preferences.xml | 15 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 4 |
10 files changed, 97 insertions, 84 deletions
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_blue.xml b/OpenKeychain/src/main/res/drawable/button_rounded_blue.xml new file mode 100644 index 000000000..2f5009478 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/button_rounded_blue.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" > + <shape android:shape="rectangle" > + <padding + android:bottom="3dip" + android:left="2dip" + android:right="2dip" + android:top="1dip" /> + <corners android:radius="6dip" /> + <solid android:color="#4444cc" /> + </shape> + </item> + <item android:state_focused="true"> + <shape android:shape="rectangle" > + <padding + android:bottom="3dip" + android:left="2dip" + android:right="2dip" + android:top="1dip" /> + <corners android:radius="6dip" /> + <solid android:color="#4444cc"/> + </shape> + </item> + <item > + <shape android:shape="rectangle" > + <padding + android:bottom="3dip" + android:left="2dip" + android:right="2dip" + android:top="1dip" /> + <corners android:radius="6dip" /> + <solid android:color="#5555ee" /> + </shape> + </item> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml index 62e7d740c..46ec736ca 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml @@ -11,12 +11,12 @@ android:orientation="horizontal"> <AutoCompleteTextView - android:id="@+id/import_server_query" + android:id="@+id/cloud_import_server_query" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:gravity="top|left" - android:hint="@string/hint_keyserver_search_hint" + android:hint="@string/hint_cloud_search_hint" android:imeOptions="actionSearch" android:inputType="textNoSuggestions" android:singleLine="true" @@ -26,7 +26,7 @@ android:layout_gravity="center_vertical" /> <ImageButton - android:id="@+id/import_server_search" + android:id="@+id/cloud_import_server_search" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -43,7 +43,7 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/import_server_config_button" + android:id="@+id/cloud_import_server_config_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" @@ -53,24 +53,5 @@ </LinearLayout> - <LinearLayout - android:id="@+id/import_server_config" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <Spinner - android:id="@+id/import_server_spinner" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml deleted file mode 100644 index c70236e07..000000000 --- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml +++ /dev/null @@ -1,32 +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="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/import_keybase_query" - android:layout_marginLeft="8dp" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="top|left" - android:hint="@string/hint_keybase_search_hint" - android:imeOptions="actionSearch" - android:inputType="textNoSuggestions" - android:singleLine="true" - android:lines="1" - android:maxLines="1" - android:minLines="1" - android:layout_gravity="center_vertical" /> - - <ImageButton - android:id="@+id/import_keybase_search" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="8dp" - android:src="@drawable/ic_action_search" - android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml index 773250dc6..74de77172 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml @@ -30,6 +30,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingRight="8dp" + android:paddingTop="2dp" + android:gravity="top|center" android:clickable="false" android:focusable="false" android:focusableInTouchMode="false" /> diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index baf7111af..33866f746 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -12,7 +12,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" > - <RelativeLayout + <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" android:layout_marginBottom="6sp" @@ -21,6 +21,7 @@ android:layout_marginTop="6sp" android:layout_weight="1" android:background="@android:drawable/menuitem_background" + android:orientation="vertical" android:focusable="true" > <TextView @@ -35,20 +36,26 @@ android:id="@+id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignLeft="@android:id/title" - android:layout_below="@android:id/title" - android:maxLines="2" android:textAppearance="?android:attr/textAppearanceSmall" /> - </RelativeLayout> - + </LinearLayout> + <Button + android:id="@+id/rotate" + android:layout_width="wrap_content" + android:layout_height="31dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="4dip" + android:layout_marginRight="6dip" + android:text="rotate" + android:textColor="#ffffffff" + android:textStyle="bold" + android:background="@drawable/button_rounded_blue" + /> <ImageButton android:id="@+id/add" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_margin="10dp" - android:layout_marginLeft="4dip" - android:layout_marginRight="6dip" android:src="@drawable/plus" android:background="@drawable/button_rounded_green"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index b4f1a2753..e93f528d3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -16,6 +16,7 @@ <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_preferences">"Preferences"</string> + <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string> <string name="title_api_registered_apps">"Apps"</string> <string name="title_key_server_preference">"Keyserver Preference"</string> <string name="title_change_passphrase">"Change Passphrase"</string> @@ -39,6 +40,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> <string name="section_keys">"Subkeys"</string> + <string name="section_cloud_search">"Cloud search"</string> <string name="section_general">"General"</string> <string name="section_defaults">"Defaults"</string> <string name="section_advanced">"Advanced"</string> @@ -125,6 +127,8 @@ <string name="label_send_key">"Upload key to selected keyserver after certification"</string> <string name="label_fingerprint">"Fingerprint"</string> <string name="expiry_date_dialog_title">"Set expiry date"</string> + <string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string> + <string name="label_preferred">"preferred"</string> <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> @@ -214,8 +218,6 @@ <item quantity="other">"%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.""</item> </plurals> - <string name="key_send_success">"Successfully uploaded key to server"</string> - <string name="key_certify_success">"Successfully certified identities"</string> <string name="list_empty">"This list is empty!"</string> <string name="nfc_successful">"Successfully sent key with NFC Beam!"</string> <string name="key_copied_to_clipboard">"Key has been copied to the clipboard!"</string> @@ -325,7 +327,7 @@ <!-- action strings --> <string name="hint_keyserver_search_hint">"Name/Email/Key ID…"</string> - <string name="hint_keybase_search_hint">"Name/Email/Proof/Key…"</string> + <string name="hint_cloud_search_hint">"Name/Email/Proof/Key…"</string> <!-- key bit length selections --> <string name="key_size_512">"512"</string> @@ -366,9 +368,9 @@ <!-- Import --> <string name="import_tab_keyserver">"Keyserver"</string> + <string name="import_tab_cloud">"Search Cloud"</string> <string name="import_tab_direct">"File/Clipboard"</string> <string name="import_tab_qr_code">"QR Code/NFC"</string> - <string name="import_tab_keybase">"Keybase.io"</string> <string name="import_import">"Import selected keys"</string> <string name="import_qr_code_wrong">"QR Code malformed! Please try again!"</string> <string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (< 16 characters)"</string> @@ -826,6 +828,11 @@ <string name="msg_se">"Starting sign and/or encrypt operation"</string> <string name="msg_se_symmetric">"Preparing symmetric encryption"</string> + <string name="msg_crt_upload_success">"Successfully uploaded key to server"</string> + <string name="msg_crt_success">"Successfully certified identities"</string> + + <string name="msg_acc_saved">"Account saved"</string> + <!-- PassphraseCache --> <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string> <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml index 3180f21aa..250f21e2a 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml @@ -1,6 +1,12 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/section_defaults"> <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference + android:entries="@array/passphrase_cache_ttl_entries" + android:entryValues="@array/passphrase_cache_ttl_values" + android:key="passphraseCacheTtl" + android:persistent="false" + android:title="@string/label_passphrase_cache_ttl" /> + <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference android:key="defaultEncryptionAlgorithm" android:persistent="false" android:title="@string/label_encryption_algorithm" /> diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml new file mode 100644 index 000000000..c87c4df7b --- /dev/null +++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:title="Search Keyserver" + android:defaultValue="true" + android:summary="Search HKP keyserver" + android:key="search_keyserver_pref" /> + + <CheckBoxPreference + android:title="Search Keybase.io" + android:defaultValue="true" + android:summary="Search Keybase.io index" + android:key="search_keybase_pref" /> + + <PreferenceScreen + android:key="keyServers" + android:persistent="false" + android:title="@string/label_keyservers" /> +</PreferenceScreen>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml deleted file mode 100644 index fd3c6c31a..000000000 --- a/OpenKeychain/src/main/res/xml/gen_preferences.xml +++ /dev/null @@ -1,15 +0,0 @@ -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:title="@string/section_general"> - <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference - android:entries="@array/passphrase_cache_ttl_entries" - android:entryValues="@array/passphrase_cache_ttl_values" - android:key="passphraseCacheTtl" - android:persistent="false" - android:title="@string/label_passphrase_cache_ttl" /> - - <PreferenceScreen - android:key="keyServers" - android:persistent="false" - android:title="@string/label_keyservers" /> - </PreferenceCategory> -</PreferenceScreen> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index e6b68507a..dd7f1c3e6 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -1,7 +1,7 @@ <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"> <header - android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$GeneralPrefsFragment" - android:title="@string/section_general" /> + android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$CloudSearchPrefsFragment" + android:title="@string/section_cloud_search" /> <header android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment" android:title="@string/section_advanced" /> |