TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 09:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into rtc_calls

Browse Source 
# Conflicts:
#	app/src/main/res/values/strings.xml
This commit is contained in:
jubb
2021-12-13 13:18:17 +11:00
parent 9da5d5ad5e 15f5ac10ec
commit 6a5f12959e
18 changed files with 184 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsession/src/main/res/values/attrs.xml
View File

@@ -87,6 +87,8 @@
<attr name="conversation_item_audio_seek_bar_color_incoming" format="reference|color" />
<attr name="conversation_item_audio_seek_bar_color_outgoing" format="reference|color" />
<attr name="conversation_item_audio_seek_bar_background_color" format="reference|color" />
<attr name="conversation_pinned_background_color" format="reference|color" />
<attr name="conversation_pinned_icon_color" format="reference|color" />
<attr name="dialog_info_icon" format="reference" />
<attr name="dialog_alert_icon" format="reference" />
@@ -117,6 +119,8 @@
<attr name="menu_photo_library_icon" format="reference" />
<attr name="menu_delete_icon" format="reference" />
<attr name="menu_info_icon" format="reference" />
<attr name="menu_pin_icon" format="reference" />
<attr name="menu_unpin_icon" format="reference" />
<attr name="pref_icon_tint" format="color"/>