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 #4539 from vector-im/feature/fre/fix_duplicated_settings 

Remove duplicated settings declaration
This commit is contained in:
Benoit Marty 2021-11-22 19:15:08 +01:00 committed by GitHub
parent ca34812f82 6c81bf6ee8
commit eba6ae592b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Remove duplicated settings declaration

18
vector/src/main/res/xml/vector_settings_preferences.xml
View File

@ -35,8 +35,8 @@
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME"
android:title="@string/preference_show_all_rooms_in_home"
android:summary="@string/all_rooms_youre_in_will_be_shown_in_home" />
android:summary="@string/all_rooms_youre_in_will_be_shown_in_home"
android:title="@string/preference_show_all_rooms_in_home" />
</im.vector.app.core.preference.VectorPreferenceCategory>
@ -121,20 +121,6 @@
android:summary="@string/settings_chat_effects_description"
android:title="@string/settings_chat_effects_title" />
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
android:summary="@string/settings_show_join_leave_messages_summary"
android:title="@string/settings_show_join_leave_messages"
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
android:title="@string/settings_show_avatar_display_name_changes_messages"
app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.app.core.preference.VectorSwitchPreference
android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
android:title="@string/settings_vibrate_on_mention"