Merge branch 'master' into export_import_settings
This commit is contained in:
commit
321e4f11ff
76 changed files with 1266 additions and 63 deletions
14
app/src/main/res/menu/cab_blocked_keywords.xml
Normal file
14
app/src/main/res/menu/cab_blocked_keywords.xml
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?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/cab_copy_keyword"
|
||||
android:icon="@drawable/ic_copy_vector"
|
||||
android:title="@string/copy_to_clipboard"
|
||||
app:showAsAction="ifRoom" />
|
||||
<item
|
||||
android:id="@+id/cab_delete"
|
||||
android:icon="@drawable/ic_delete_vector"
|
||||
android:title="@string/delete"
|
||||
app:showAsAction="ifRoom" />
|
||||
</menu>
|
||||
|
|
@ -26,6 +26,11 @@
|
|||
android:icon="@drawable/ic_save_vector"
|
||||
android:title="@string/save_as"
|
||||
app:showAsAction="ifRoom" />
|
||||
<item
|
||||
android:id="@+id/cab_properties"
|
||||
android:icon="@drawable/ic_info_vector"
|
||||
android:title="@string/properties"
|
||||
app:showAsAction="ifRoom" />
|
||||
<item
|
||||
android:id="@+id/cab_forward_message"
|
||||
android:showAsAction="never"
|
||||
|
|
|
|||
9
app/src/main/res/menu/menu_add_blocked_keyword.xml
Normal file
9
app/src/main/res/menu/menu_add_blocked_keyword.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?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/add_blocked_keyword"
|
||||
android:icon="@drawable/ic_plus_vector"
|
||||
android:title="@string/add_a_blocked_keyword"
|
||||
app:showAsAction="ifRoom" />
|
||||
</menu>
|
||||
Loading…
Add table
Add a link
Reference in a new issue