diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-07-20 17:09:34 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-07-20 17:09:34 +0200 |
| commit | 2913a78b188e81fe6bd91d26fb0ae083cf504bde (patch) | |
| tree | 69677749c102d3b729ada72b0acabff94de3d285 /OpenKeychain/src/main/res | |
| parent | bc9922263ca98e97a8182c72c4bf5b089e512395 (diff) | |
| download | open-keychain-2913a78b188e81fe6bd91d26fb0ae083cf504bde.tar.gz open-keychain-2913a78b188e81fe6bd91d26fb0ae083cf504bde.tar.bz2 open-keychain-2913a78b188e81fe6bd91d26fb0ae083cf504bde.zip | |
Load of rework on EncryptActivity, still some TODOs
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 43 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 284fdd9ce..b5d7b98cd 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -9,12 +9,31 @@ android:paddingRight="16dp" android:paddingLeft="16dp"> - <CheckBox - android:id="@+id/sign" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_sign"/> + android:padding="0dp" + android:layout_margin="0dp" + style="@android:style/Widget.EditText"> + <TextView + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="From: "/> + <Spinner + android:id="@+id/sign" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_sign" + android:padding="0dp" + android:layout_margin="0dp" + /> + + </LinearLayout> <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView android:id="@+id/recipient_list" diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml new file mode 100644 index 000000000..35c618c72 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="wrap_content" + android:padding="8dp" + android:layout_height="wrap_content"> + <TextView + android:id="@android:id/text1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium"/> + <TextView + android:id="@android:id/text2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall"/> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index d52097433..156fce8f0 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -28,14 +28,6 @@ <View android:layout_width="match_parent" android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp"/> - - <include layout="@layout/encrypt_content_adv_settings" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" android:background="?android:attr/listDivider"/> <LinearLayout |