Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move "Ignored users" setting section into "Security & Privacy", as per Element Web

Browse Source
This commit is contained in:
Benoit Marty 2022-04-15 13:14:03 +02:00
parent e58677a104
commit a50bf4582c
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector-config/src/main/res/values/config-settings.xml
View File

@ -13,7 +13,6 @@
<bool name="settings_root_notification_visible">true</bool> <bool name="settings_root_notification_visible">true</bool>
<bool name="settings_root_preferences_visible">true</bool> <bool name="settings_root_preferences_visible">true</bool>
<bool name="settings_root_voice_video_visible">true</bool> <bool name="settings_root_voice_video_visible">true</bool>
<bool name="settings_root_ignored_users_visible">true</bool>
<bool name="settings_root_security_privacy_visible">true</bool> <bool name="settings_root_security_privacy_visible">true</bool>
<bool name="settings_root_labs_visible">true</bool> <bool name="settings_root_labs_visible">true</bool>
<bool name="settings_root_advanced_visible">true</bool> <bool name="settings_root_advanced_visible">true</bool>
@ -33,10 +32,10 @@
<!-- Level 1: Voice and video --> <!-- Level 1: Voice and video -->
<!-- Level 1: Ignored Users -->
<!-- Level 1: Security and Privacy --> <!-- Level 1: Security and Privacy -->
<bool name="settings_ignored_users_visible">true</bool>
<!-- Level 1: Labs --> <!-- Level 1: Labs -->
<bool name="settings_labs_thread_messages_default">false</bool> <bool name="settings_labs_thread_messages_default">false</bool>

6
vector/src/main/res/xml/vector_settings_root.xml
View File

@ -32,12 +32,6 @@
app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment" app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment"
app:isPreferenceVisible="@bool/settings_root_voice_video_visible" /> app:isPreferenceVisible="@bool/settings_root_voice_video_visible" />
<im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_ignored_users"
android:title="@string/settings_ignored_users"
app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment"
app:isPreferenceVisible="@bool/settings_root_ignored_users_visible" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_security_privacy" android:icon="@drawable/ic_settings_root_security_privacy"
android:title="@string/settings_security_and_privacy" android:title="@string/settings_security_and_privacy"

13
vector/src/main/res/xml/vector_settings_security_privacy.xml
View File

@ -101,6 +101,19 @@
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_IGNORED_USERS_PREFERENCE_CATEGORY_KEY"
android:title="@string/settings_ignored_users"
app:isPreferenceVisible="@bool/settings_ignored_users_visible">
<im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_ignored_users"
android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
android:title="@string/settings_ignored_users"
app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY" android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
android:title="@string/settings_analytics"> android:title="@string/settings_analytics">