diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 90 |
1 files changed, 26 insertions, 64 deletions
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index cde92b477..74d723d69 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -1,77 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingBottom="4dp" - android:paddingRight="16dp" - android:paddingLeft="16dp"> - - <LinearLayout +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingRight="16dp" + android:paddingLeft="16dp"> - <CheckBox - android:id="@+id/sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_sign" /> - - <LinearLayout + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="4dip"> - - <TextView - android:id="@+id/mainUserId" + 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:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/from"/> + <Spinner + android:id="@+id/sign" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + android:layout_gravity="center_vertical"/> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/label_selectPublicKeys" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="@string/label_select_public_keys" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Button - android:id="@+id/btn_selectEncryptKeys" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="4dp" - android:text="@string/select_keys_button_default" - android:background="@drawable/button_edgy" - android:drawableLeft="@drawable/ic_action_person" /> </LinearLayout> + + <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView + android:id="@+id/recipient_list" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> </LinearLayout>
\ No newline at end of file |