diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-15 20:02:57 +0100 |
| commit | 4afd6b881edfd0bc404734a4e8959a7a0fa785a7 (patch) | |
| tree | 63a051fb595d168f8ddbfd76a51bb2319889d40b /OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml | |
| parent | ba7d8a58673d55660bc7faf68970229f17458514 (diff) | |
| parent | db39b779c984a758e13adc16837893509f3b364f (diff) | |
| download | open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.gz open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.tar.bz2 open-keychain-4afd6b881edfd0bc404734a4e8959a7a0fa785a7.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml | 75 |
1 files changed, 0 insertions, 75 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 |