diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:37:45 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-31 17:37:45 +0200 |
| commit | 06eb7148a264dbf05c97689017dd89afa8971aeb (patch) | |
| tree | 71e2b6af1972dacfc319e526a7b14a0968d3a978 | |
| parent | 7da783228499ea9d5b0a98201e8ba5b17e30bb10 (diff) | |
| parent | 5444c14ef916047b253ff7d0fc32d9f67b4161e8 (diff) | |
| download | open-keychain-06eb7148a264dbf05c97689017dd89afa8971aeb.tar.gz open-keychain-06eb7148a264dbf05c97689017dd89afa8971aeb.tar.bz2 open-keychain-06eb7148a264dbf05c97689017dd89afa8971aeb.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/certify_key_fragment.xml | 21 |
2 files changed, 15 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index 6ef31913a..c5477adba 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index e2dba9890..449db4c6a 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -132,13 +133,21 @@ android:checked="false" android:text="@string/label_send_key" /> - <Spinner - android:id="@+id/upload_key_keyserver" + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - android:enabled="false" /> + android:layout_height="match_parent" + custom:foldedLabel="@string/api_settings_show_advanced" + custom:unFoldedLabel="@string/api_settings_hide_advanced"> + + <Spinner + android:id="@+id/upload_key_keyserver" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" + android:enabled="false" /> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> <TextView style="@style/SectionHeader" |