Merge branch 'master' into export_import_settings
# Conflicts: # app/src/main/res/menu/menu_main.xml
This commit is contained in:
commit
05ced83909
71 changed files with 1278 additions and 206 deletions
|
|
@ -3,6 +3,11 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:ignore="AppCompatResource,AlwaysShowAction">
|
||||
<item
|
||||
android:id="@+id/show_archived"
|
||||
android:showAsAction="never"
|
||||
android:title="@string/show_archived_conversations"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/settings"
|
||||
android:icon="@drawable/ic_settings_cog_vector"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue