filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5847 from vector-im/bugfix/eric/missing-call-icons 

Fixes Missing Call Icons when threads are enabled
This commit is contained in:
Benoit Marty 2022-04-26 22:30:07 +02:00 committed by GitHub
parent d694ea16a8 9c951687b0
commit 521fd1fcd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5847.bugfix Normal file
View File

@ -0,0 +1 @@
Fixes missing call icons when threads are enabled

12
vector/src/main/res/menu/menu_timeline.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item <item
android:id="@+id/timeline_setting" android:id="@+id/timeline_setting"
@ -19,24 +20,27 @@
android:title="@string/action_invite" android:title="@string/action_invite"
app:showAsAction="never" /> app:showAsAction="never" />
<!-- We always want to show this item as an icon -->
<item <item
android:id="@+id/video_call" android:id="@+id/video_call"
android:icon="@drawable/ic_video" android:icon="@drawable/ic_video"
android:title="@string/action_video_call" android:title="@string/action_video_call"
android:visible="false" android:visible="false"
app:iconTint="?colorPrimary" app:iconTint="?colorPrimary"
app:showAsAction="ifRoom" app:showAsAction="always"
tools:visible="true" /> tools:visible="true" />
<!-- We always want to show this item as an icon -->
<item <item
android:id="@+id/voice_call" android:id="@+id/voice_call"
android:icon="@drawable/ic_phone" android:icon="@drawable/ic_phone"
android:title="@string/call" android:title="@string/action_voice_call"
android:visible="false" android:visible="false"
app:iconTint="?colorPrimary" app:iconTint="?colorPrimary"
app:showAsAction="ifRoom" app:showAsAction="always"
tools:visible="true" /> tools:visible="true" />
<!-- We always want to show this item as an icon -->
<item <item
android:id="@+id/menu_timeline_thread_list" android:id="@+id/menu_timeline_thread_list"
android:title="@string/action_view_threads" android:title="@string/action_view_threads"