diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-02 21:30:41 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 14:59:33 +0100 |
| commit | 5b6bc24a0c87162609d1c2b60ac8c13144641680 (patch) | |
| tree | 9de730e44ba897e2ce5c5b96a1e3b99c208483fa /OpenKeychain/src/main/res | |
| parent | 50248bd570f1de019b18a467e5181c4d14a772f6 (diff) | |
| download | open-keychain-5b6bc24a0c87162609d1c2b60ac8c13144641680.tar.gz open-keychain-5b6bc24a0c87162609d1c2b60ac8c13144641680.tar.bz2 open-keychain-5b6bc24a0c87162609d1c2b60ac8c13144641680.zip | |
extend-uid: add option icon for edit action mode
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 39 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index a9ebe43d3..e2899f806 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:singleLine="true"> @@ -40,16 +41,19 @@ </LinearLayout> - - <LinearLayout - android:id="@+id/user_id_item_certified_layout" + <org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator + android:id="@+id/user_id_icon_animator" android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:layout_gravity="center_vertical" - android:orientation="vertical"> + android:orientation="vertical" + custom:initialView="1"> + + <Space + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> <ImageView android:id="@+id/user_id_item_certified" @@ -58,15 +62,14 @@ android:src="@drawable/status_signature_unverified_cutout_24dp" android:layout_gravity="center_horizontal" /> - </LinearLayout> + <ImageView + android:id="@+id/user_id_item_edit_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_mode_edit_grey_24dp" + android:layout_gravity="center_vertical" /> - <ImageView - android:id="@+id/user_id_item_edit_image" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/ic_mode_edit_grey_24dp" - android:padding="8dp" - android:layout_gravity="center_vertical" /> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> <ImageButton android:id="@+id/user_id_item_delete_button" diff --git a/OpenKeychain/src/main/res/menu/action_edit_uids.xml b/OpenKeychain/src/main/res/menu/action_edit_uids.xml new file mode 100644 index 000000000..da486afff --- /dev/null +++ b/OpenKeychain/src/main/res/menu/action_edit_uids.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_uids_save" + android:title="@string/menu_uids_save" + app:showAsAction="always" /> + +</menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/edit_user_id.xml b/OpenKeychain/src/main/res/menu/edit_user_id.xml new file mode 100644 index 000000000..d1f856fd2 --- /dev/null +++ b/OpenKeychain/src/main/res/menu/edit_user_id.xml @@ -0,0 +1,12 @@ +<?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_edit_user_ids" + android:icon="@drawable/ic_mode_edit_white_24dp" + android:title="@string/key_view_action_edit" + app:showAsAction="always" + /> + +</menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index eb6dab882..33babe763 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1704,5 +1704,6 @@ <string name="toast_wrong_mimetype">"Wrong data type, text was expected!"</string> <string name="toast_no_text">"No text in shared data!"</string> <string name="btn_search_for_query">"Search for\n'%s'"</string> + <string name="menu_uids_save">Save</string> </resources> |