diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 72 insertions, 76 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index 88b96284f..d8d729fae 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -89,79 +89,4 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="16dp" - custom:foldedLabel="@string/api_settings_show_advanced" - custom:unFoldedLabel="@string/api_settings_hide_advanced"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dp" - android:layout_margin="0dp"> - - <TextView - android:paddingLeft="8dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_encryption_algorithm" - android:paddingRight="8dp" /> - - <Spinner - android:id="@+id/api_account_settings_encryption_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dp" - android:layout_margin="0dp"> - - <TextView - android:paddingLeft="8dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_hash_algorithm" - android:paddingRight="8dp" /> - - <Spinner - android:id="@+id/api_account_settings_hash_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="0dp" - android:layout_margin="0dp"> - - <TextView - android:paddingLeft="8dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_message_compression" - android:paddingRight="8dp" /> - - <Spinner - android:id="@+id/api_account_settings_compression" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - </LinearLayout> - - </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> - </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml b/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml new file mode 100644 index 000000000..0528fc11e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_below="@id/toolbar_include" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:padding="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_select_sign_key_list_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:text="@string/api_select_sign_key_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <FrameLayout + android:id="@+id/api_select_sign_key_list_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/api_select_sign_key_create_key" + android:background="?android:selectableItemBackground" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:text="@string/api_settings_create_key" + android:layout_height="?android:attr/listPreferredItemHeight" + android:drawableLeft="@drawable/ic_key_plus_grey600_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + </LinearLayout> + </ScrollView> + </LinearLayout> +</RelativeLayout>
\ 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 8ac9e8c5c..aca3fdfcd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -491,7 +491,7 @@ <string name="api_settings_hide_advanced">"Hide advanced settings"</string> <string name="api_settings_no_key">"No key selected"</string> <string name="api_settings_select_key">"Select key"</string> - <string name="api_settings_create_key">"Create new key for this account"</string> + <string name="api_settings_create_key">"Create new key"</string> <string name="api_settings_save">"Save"</string> <string name="api_settings_save_msg">"Account has been saved"</string> <string name="api_settings_cancel">"Cancel"</string> @@ -517,6 +517,7 @@ <string name="api_select_pub_keys_text">"Please review the list of recipients!"</string> <string name="api_select_pub_keys_text_no_user_ids">"Please select the recipients!"</string> <string name="api_error_wrong_signature">"Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again."</string> + <string name="api_select_sign_key_text">"Please select one of your existing keys or create a new one."</string> <!-- Share --> <string name="share_qr_code_dialog_title">"Share with QR Code"</string> |