diff --git a/.reuse/dep5 b/.reuse/dep5 index cbe52ddd2..0b500a84c 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -17,6 +17,26 @@ Copyright: 2020-2021, Collabora, Ltd. and the Monado contributors License: CC0-1.0 Comment: Prevents needing a license header per fragment between releases. +Files: src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/*.webp + src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/*.webp + src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/*.webp + src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/*.webp + src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/*.webp + src/xrt/targets/openxr_android/src/main/ic_launcher-playstore.png + src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/*.webp + src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/*.webp + src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/*.webp + src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/*.webp + src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/*.webp + src/xrt/targets/openxr_android/src/inProcess/ic_launcher_inproc-playstore.png + src/xrt/targets/openxr_android/src/main/res/drawable-mdpi/*.png + src/xrt/targets/openxr_android/src/main/res/drawable-hdpi/*.png + src/xrt/targets/openxr_android/src/main/res/drawable-xhdpi/*.png + src/xrt/targets/openxr_android/src/main/res/drawable-xxhdpi/*.png +Copyright: 2023-2024, Collabora, Ltd. +License: CC-BY-4.0 +Comment: Based on the official Monado logo commissioned by Collabora. + Files: doc/doxygen-awesome-css/* Copyright: 2021-2023, jothepro License: MIT diff --git a/src/xrt/targets/android_common/src/main/AndroidManifest.xml b/src/xrt/targets/android_common/src/main/AndroidManifest.xml index 15c70a746..2791bf06b 100644 --- a/src/xrt/targets/android_common/src/main/AndroidManifest.xml +++ b/src/xrt/targets/android_common/src/main/AndroidManifest.xml @@ -43,8 +43,6 @@ diff --git a/src/xrt/targets/android_common/src/main/res/drawable/ic_monado_icon_fullsize.xml b/src/xrt/targets/android_common/src/main/res/drawable/ic_monado_icon_fullsize.xml new file mode 100644 index 000000000..09bb26dcd --- /dev/null +++ b/src/xrt/targets/android_common/src/main/res/drawable/ic_monado_icon_fullsize.xml @@ -0,0 +1,14 @@ + + + + diff --git a/src/xrt/targets/android_common/src/main/res/ic_monado_vertical.xml b/src/xrt/targets/android_common/src/main/res/ic_monado_vertical.xml new file mode 100644 index 000000000..727326d6f --- /dev/null +++ b/src/xrt/targets/android_common/src/main/res/ic_monado_vertical.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/src/xrt/targets/android_common/src/main/res/layout/activity_about.xml b/src/xrt/targets/android_common/src/main/res/layout/activity_about.xml index 387060ffa..87bfd05ba 100644 --- a/src/xrt/targets/android_common/src/main/res/layout/activity_about.xml +++ b/src/xrt/targets/android_common/src/main/res/layout/activity_about.xml @@ -20,7 +20,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_monado_logo" /> + app:srcCompat="@drawable/ic_monado_vertical" /> + + + + + diff --git a/src/xrt/targets/openxr_android/src/inProcess/ic_launcher_inproc-playstore.png b/src/xrt/targets/openxr_android/src/inProcess/ic_launcher_inproc-playstore.png new file mode 100644 index 000000000..f03edec57 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/ic_launcher_inproc-playstore.png differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_launcher.xml b/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_launcher.xml new file mode 100644 index 000000000..4043bbb0e --- /dev/null +++ b/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_launcher.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_mono.xml b/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_mono.xml new file mode 100644 index 000000000..bbf783609 --- /dev/null +++ b/src/xrt/targets/openxr_android/src/inProcess/res/drawable/ic_logo_inproc_mono.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc.xml b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc.xml new file mode 100644 index 000000000..606612eea --- /dev/null +++ b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc_round.xml b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc_round.xml new file mode 100644 index 000000000..606612eea --- /dev/null +++ b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-anydpi-v26/ic_launcher_inproc_round.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc.webp new file mode 100644 index 000000000..50906472f Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc_round.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc_round.webp new file mode 100644 index 000000000..1b4c050fc Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-hdpi/ic_launcher_inproc_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc.webp new file mode 100644 index 000000000..b5166da46 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc_round.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc_round.webp new file mode 100644 index 000000000..9b4b31ac0 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-mdpi/ic_launcher_inproc_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc.webp new file mode 100644 index 000000000..c0cfef87a Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc_round.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc_round.webp new file mode 100644 index 000000000..0afeef9d5 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xhdpi/ic_launcher_inproc_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc.webp new file mode 100644 index 000000000..8bfbf9858 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc_round.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc_round.webp new file mode 100644 index 000000000..53a66ef88 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxhdpi/ic_launcher_inproc_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc.webp new file mode 100644 index 000000000..3bffbadbd Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc.webp differ diff --git a/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc_round.webp b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc_round.webp new file mode 100644 index 000000000..174069c77 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/inProcess/res/mipmap-xxxhdpi/ic_launcher_inproc_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml index c506eb3ca..59d97ed87 100644 --- a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml +++ b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml @@ -2,7 +2,8 @@ @@ -46,7 +47,8 @@ @@ -55,7 +57,6 @@ + + + + + diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable-hdpi/ic_monado_notif.png b/src/xrt/targets/openxr_android/src/main/res/drawable-hdpi/ic_monado_notif.png new file mode 100644 index 000000000..30f8aba42 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/drawable-hdpi/ic_monado_notif.png differ diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable-mdpi/ic_monado_notif.png b/src/xrt/targets/openxr_android/src/main/res/drawable-mdpi/ic_monado_notif.png new file mode 100644 index 000000000..dc5d6fc65 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/drawable-mdpi/ic_monado_notif.png differ diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable-xhdpi/ic_monado_notif.png b/src/xrt/targets/openxr_android/src/main/res/drawable-xhdpi/ic_monado_notif.png new file mode 100644 index 000000000..739fd77ad Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/drawable-xhdpi/ic_monado_notif.png differ diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable-xxhdpi/ic_monado_notif.png b/src/xrt/targets/openxr_android/src/main/res/drawable-xxhdpi/ic_monado_notif.png new file mode 100644 index 000000000..1a51950d1 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/drawable-xxhdpi/ic_monado_notif.png differ diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable/ic_logo_launcher.xml b/src/xrt/targets/openxr_android/src/main/res/drawable/ic_logo_launcher.xml new file mode 100644 index 000000000..b3cb95364 --- /dev/null +++ b/src/xrt/targets/openxr_android/src/main/res/drawable/ic_logo_launcher.xml @@ -0,0 +1,15 @@ + + + + diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_logo.xml b/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_logo.xml deleted file mode 100644 index 1b4b099b3..000000000 --- a/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_logo.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_vertical.xml b/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_vertical.xml new file mode 100644 index 000000000..727326d6f --- /dev/null +++ b/src/xrt/targets/openxr_android/src/main/res/drawable/ic_monado_vertical.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..51c167ef0 --- /dev/null +++ b/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..091517ef9 --- /dev/null +++ b/src/xrt/targets/openxr_android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 000000000..d4abd27fb Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 000000000..bd29608a9 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 000000000..a667be375 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 000000000..e2c3bef80 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 000000000..25668d9d8 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..e14038529 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 000000000..d66edb013 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..f9bc63c3a Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 000000000..88fd30bcf Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 000000000..c255aa513 Binary files /dev/null and b/src/xrt/targets/openxr_android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/src/xrt/targets/openxr_android/src/main/res/values/ic_launcher_background.xml b/src/xrt/targets/openxr_android/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..a9bc549da --- /dev/null +++ b/src/xrt/targets/openxr_android/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,9 @@ + + + + #FFFFFF +