diff --git a/changelog.d/5773.misc b/changelog.d/5773.misc
new file mode 100644
index 0000000000..39c8b42073
--- /dev/null
+++ b/changelog.d/5773.misc
@@ -0,0 +1 @@
+Move "Ignored users" setting section into "Security & Privacy"
\ No newline at end of file
diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index b6d1c6676c..0a4da4c98e 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -13,7 +13,6 @@
true
true
true
- true
true
true
true
@@ -33,10 +32,10 @@
-
-
+ true
+
false
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 1581bb4676..70ed3f441e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -186,6 +186,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
private val secureBackupPreference by lazy {
findPreference("SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY")!!
}
+
+ private val ignoredUsersPreference by lazy {
+ findPreference("SETTINGS_IGNORED_USERS_PREFERENCE_KEY")!!
+ }
// private val secureBackupResetPreference by lazy {
// findPreference(VectorPreferences.SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY)
// }
@@ -275,6 +279,11 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_content_primary)
}
+ ignoredUsersPreference.icon = activity?.let {
+ ThemeUtils.tintDrawable(it,
+ ContextCompat.getDrawable(it, R.drawable.ic_settings_root_ignored_users)!!, R.attr.vctr_content_primary)
+ }
+
findPreference(VectorPreferences.SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT)?.let {
it.icon = ThemeUtils.tintDrawableWithColor(
ContextCompat.getDrawable(requireContext(), R.drawable.ic_notification_privacy_warning)!!,
diff --git a/vector/src/main/res/drawable/ic_secure_backup.xml b/vector/src/main/res/drawable/ic_secure_backup.xml
index 899bb8d2ae..78bb71e829 100644
--- a/vector/src/main/res/drawable/ic_secure_backup.xml
+++ b/vector/src/main/res/drawable/ic_secure_backup.xml
@@ -1,4 +1,5 @@
+ android:fillColor="#2E2F32"
+ tools:fillColor="#FF0000"/>
+ android:fillColor="#2E2F32"
+ tools:fillColor="#FF0000"/>
+ android:fillType="evenOdd"
+ tools:fillColor="#FF0000"/>
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 744694cf5f..0c50083d53 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -32,12 +32,6 @@
app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment"
app:isPreferenceVisible="@bool/settings_root_voice_video_visible" />
-
-
+
+
+
+
+
+