diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 18:53:40 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 18:53:40 +0200 |
commit | 28df004cbb27677b5d7fac8a7bbe3d75618c036c (patch) | |
tree | 9f5adac6ad67f24384b94d1f3a8e09caa6cf5903 /OpenKeychain/src/main/res/layout | |
parent | a58440b85dc45fab3f3b403e062ead7354c31105 (diff) | |
parent | e1958009bd022021971c1fd2f81557fb4fe99e4e (diff) | |
download | open-keychain-28df004cbb27677b5d7fac8a7bbe3d75618c036c.tar.gz open-keychain-28df004cbb27677b5d7fac8a7bbe3d75618c036c.tar.bz2 open-keychain-28df004cbb27677b5d7fac8a7bbe3d75618c036c.zip |
Merge pull request #767 from mar-v-in/issue-763
Use dropdown in CertifyActivity
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r-- | OpenKeychain/src/main/res/layout/certify_key_activity.xml | 12 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/layout/keyspinner_key.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml) | 0 |
3 files changed, 5 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index 34d4dbd57..bce194438 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -26,14 +26,10 @@ android:layout_marginTop="14dp" android:text="@string/section_certification_key" /> - <fragment - android:id="@+id/sign_key_select_key_fragment" - android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - tools:layout="@layout/select_secret_key_layout_fragment" /> + <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner + android:id="@+id/certify_key_spinner" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> <TextView style="@style/SectionHeader" diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 4d82477bc..2189a1f34 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -24,7 +24,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/label_asymmetric_from" /> - <Spinner + <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner android:id="@+id/sign" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/keyspinner_key.xml index 703f9133b..703f9133b 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_key.xml |