diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/edit_key_fragment.xml | 30 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_subkey_item.xml (renamed from OpenKeychain/src/main/res/layout/view_key_keys_item.xml) | 42 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_user_id_item.xml (renamed from OpenKeychain/src/main/res/layout/view_key_userids_item.xml) | 1 |
3 files changed, 59 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml index 2ffbc66f4..e4c374130 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml @@ -117,6 +117,36 @@ android:clickable="true" style="@style/SelectableItem" /> + <LinearLayout + android:id="@+id/edit_key_debug_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:text="DEBUG options" + android:layout_weight="1" /> + + <TextView + android:id="@+id/edit_key_debug_change_passphrase" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/edit_key_action_change_passphrase" + android:minHeight="?android:attr/listPreferredItemHeight" + android:drawableRight="@drawable/ic_action_edit" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> + </LinearLayout> + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml index 13feaf2cc..0c0a5d7e6 100644 --- a/OpenKeychain/src/main/res/layout/view_key_keys_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:paddingRight="3dip" android:singleLine="true"> <ImageView @@ -13,28 +12,44 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/key_small" - android:layout_marginLeft="8dp" /> + android:padding="8dp" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/edit_image" + android:src="@drawable/ic_action_edit" + android:padding="8dp" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> <LinearLayout android:orientation="vertical" - android:layout_width="fill_parent" + android:layout_toRightOf="@id/ic_masterKey" + android:layout_toLeftOf="@id/edit_image" + android:layout_centerVertical="true" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp"> + android:layout_marginRight="8dp" + android:id="@+id/linearLayout"> <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:orientation="horizontal" android:paddingBottom="2dip" android:paddingTop="2dip"> <TextView android:id="@+id/keyId" - android:layout_width="0dp" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/label_key_id" + android:text="0x00000000" android:textAppearance="?android:attr/textAppearanceMedium" android:typeface="monospace" android:layout_weight="1" /> @@ -75,8 +90,8 @@ <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <TextView android:id="@+id/keyDetails" @@ -94,8 +109,9 @@ android:text="Expiry: 4/7/2016" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_gravity="right" /> + </LinearLayout> </LinearLayout> -</LinearLayout> +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml index 8f036e600..7de2f9c05 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml @@ -63,7 +63,6 @@ </LinearLayout> - <ImageView android:layout_width="wrap_content" android:layout_height="match_parent" |