diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 21:50:56 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-21 21:50:56 +0200 |
| commit | bf0104af2e25ddfe747a960a626e38ae8d203593 (patch) | |
| tree | ca364f127368c6944d0c6a32cf3e12338abe9ee5 /OpenKeychain/src/main/res | |
| parent | d4387c01795a0fc62319cd715c72699c10d4a7cb (diff) | |
| download | open-keychain-bf0104af2e25ddfe747a960a626e38ae8d203593.tar.gz open-keychain-bf0104af2e25ddfe747a960a626e38ae8d203593.tar.bz2 open-keychain-bf0104af2e25ddfe747a960a626e38ae8d203593.zip | |
Feature to change key configuration in create key
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/create_key_final_fragment.xml | 48 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
2 files changed, 53 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 6814cd259..7f7b2cdce 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -74,6 +74,54 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:id="@+id/create_key_edit_text" + android:padding="8dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/create_key_rsa" + android:textColor="@color/android_green_dark" + android:textAppearance="?android:attr/textAppearanceMedium" + android:minHeight="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:gravity="center_vertical" + android:layout_gravity="center_vertical" /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/create_key_edit_button" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/create_key_edit" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" + android:layout_gravity="center_vertical" /> + </LinearLayout> + + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5d79441cf..3b1f01f1f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -495,7 +495,7 @@ <item>"Revoke Subkey"</item> <item>"Strip Subkey"</item> </string-array> - <string name="edit_key_new_subkey">"new"</string> + <string name="edit_key_new_subkey">"new subkey"</string> <string name="edit_key_select_flag">"Please select at least one flag!"</string> <!-- Create key --> @@ -503,9 +503,12 @@ <string name="create_key_empty">"This field is required"</string> <string name="create_key_passphrases_not_equal">"Passphrases do not match"</string> <string name="create_key_final_text">"You entered the following identity:"</string> - <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…\n(3 subkeys, RSA, 4096 bit)"</string> + <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string> + <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string> + <string name="create_key_custom">"(custom key configuration)"</string> <string name="create_key_text">"Enter your full name, email address, and choose a passhrase."</string> <string name="create_key_hint_full_name">"Full Name, e.g. Max Mustermann"</string> + <string name="create_key_edit">"Change key configuration"</string> <!-- View key --> <string name="view_key_revoked">"This key has been revoked!"</string> |