inline-edit: move action mode menu handling int activity

This commit is contained in:
Vincent Breitmoser
2015-11-15 23:24:20 +01:00
committed by Dominik Schürmann
parent 69220cb4c0
commit aca0cd340b
7 changed files with 147 additions and 78 deletions

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="0dp"
android:src="@drawable/ic_mode_edit_white_24dp"
style="@style/Widget.AppCompat.ActionButton" />

View File

@@ -3,9 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_edit_user_ids"
android:id="@+id/menu_action_mode_edit"
android:icon="@drawable/ic_mode_edit_white_24dp"
android:title="@string/key_view_action_edit_ids"
android:title="@string/key_view_action_edit"
app:showAsAction="always"
/>

View File

@@ -1,12 +0,0 @@
<?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_subkeys"
android:icon="@drawable/ic_mode_edit_white_24dp"
android:title="@string/key_view_action_edit_subkeys"
app:showAsAction="always"
/>
</menu>

View File

@@ -666,8 +666,7 @@
<string name="key_list_fab_import">"Import from File"</string>
<!-- Key view -->
<string name="key_view_action_edit_ids">"Edit Identities"</string>
<string name="key_view_action_edit_subkeys">"Edit Subkeys"</string>
<string name="key_view_action_edit">"Edit"</string>
<string name="key_view_action_encrypt">"Encrypt text"</string>
<string name="key_view_action_encrypt_files">"files"</string>
<string name="key_view_action_certify">"Confirm key"</string>