diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 08:32:41 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 08:32:41 +0100 |
| commit | fd3a1e900e7f8ea7ed8c15791f227203df118ada (patch) | |
| tree | 30d89dbad51bc29e6486e9fb717877387af38934 /OpenKeychain/src/main/res | |
| parent | f691ef2a262012898c3f0b61fa9357a59292288b (diff) | |
| download | open-keychain-fd3a1e900e7f8ea7ed8c15791f227203df118ada.tar.gz open-keychain-fd3a1e900e7f8ea7ed8c15791f227203df118ada.tar.bz2 open-keychain-fd3a1e900e7f8ea7ed8c15791f227203df118ada.zip | |
Move edit key configuration to menu
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 11 insertions, 49 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 118f0661a..578e036d8 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -75,54 +75,6 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/create_key_edit_text" - android:padding="8dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/create_key_rsa" - android:textColor="?attr/colorPrimary" - android:textAppearance="?android:attr/textAppearanceMedium" - android:minHeight="?android:attr/listPreferredItemHeight" - android:clickable="true" - android:gravity="center_vertical" - android:layout_gravity="center_vertical" /> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:background="?android:attr/listDivider" /> - - <TextView - android:id="@+id/create_key_edit_button" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/create_key_edit" - android:minHeight="?android:attr/listPreferredItemHeight" - android:gravity="center_vertical" - android:clickable="true" - android:background="?android:selectableItemBackground" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml index 5221fa6e6..e6e92c451 100644 --- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml @@ -80,7 +80,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:paddingRight="10dp" + android:paddingRight="4dp" android:src="@drawable/ic_chevron_right_grey_24dp" /> <TextView diff --git a/OpenKeychain/src/main/res/menu/create_key_final.xml b/OpenKeychain/src/main/res/menu/create_key_final.xml new file mode 100644 index 000000000..e68b9b4a4 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/create_key_final.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_create_key_edit" + android:title="@string/create_key_edit" + app:showAsAction="never" /> + +</menu> |