diff options
| author | Christian Schneppe <kriztan@users.noreply.github.com> | 2018-09-27 18:42:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 18:42:25 +0200 |
| commit | 4f4a52f068f3b3956aca5934531a48d1f90d7974 (patch) | |
| tree | da24e0f840730a75f2b3dab69a3b5f12025391be /src/main/res/values/attrs.xml | |
| parent | 1816092e68584b5794303578b6af6d621ffc58d4 (diff) | |
| parent | f4ac1f68feac3e3b19ab5932ede9d79dd14bff27 (diff) | |
Merge branch 'master' into bubble-into-avatar
Diffstat (limited to 'src/main/res/values/attrs.xml')
| -rw-r--r-- | src/main/res/values/attrs.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e89ed2944..672cb00fb 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -42,6 +42,16 @@ <attr name="conversations_overview_background" format="reference|color" /> + <attr name="media_preview_document" format="reference" /> + <attr name="media_preview_recording" format="reference" /> + <attr name="media_preview_audio" format="reference" /> + <attr name="media_preview_location" format="reference" /> + <attr name="media_preview_contact" format="reference" /> + <attr name="media_preview_app" format="reference" /> + <attr name="media_preview_calendar" format="reference" /> + <attr name="media_preview_archive" format="reference" /> + <attr name="media_preview_unknown" format="reference" /> + <attr name="icon_add_group" format="reference" /> <attr name="icon_add_person" format="reference" /> <attr name="icon_cancel" format="reference" /> @@ -83,6 +93,7 @@ <attr name="ic_attach_photo" format="reference" /> <attr name="ic_attach_record" format="reference" /> <attr name="ic_attach_video" format="reference" /> + <attr name="ic_attach_videocam" format="reference" /> <attr name="ic_file_apk" format="reference" /> <attr name="ic_file_pdf" format="reference" /> @@ -90,6 +101,7 @@ <attr name="ic_file_calendar" format="reference" /> <attr name="icon_alpha" format="float" /> + <attr name="delete_icon_alpha" format="float" /> <attr name="popupOverlayStyle" format="reference" /> |