Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair

Remove remaining dead code about flair
element-hq · May 12, 2022 · 4309fdb · 4309fdb
2 parents e56f6e9 + 1ef5416
commit 4309fdb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
@@ -1057,7 +1057,7 @@
     <string name="settings_play_shutter_sound">Play shutter sound</string>
 
     <!-- TODO Remove -->
-    <string name="settings_flair" tools:ignore="MissingTranslation">Flair</string>
+    <string name="settings_flair" tools:ignore="UnusedResources">Flair</string>
 
     <!-- medias saving settings -->
     <string name="media_saving_period_3_days">3 days</string>

diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
@@ -8,12 +8,6 @@
         app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment"
         app:isPreferenceVisible="@bool/settings_root_general_visible" />
 
-    <im.vector.app.core.preference.VectorPreference
-        android:icon="@drawable/ic_settings_root_flair"
-        android:title="@string/settings_flair"
-        app:fragment="im.vector.app.features.settings.VectorSettingsFlairFragment"
-        app:isPreferenceVisible="@bool/false_not_implemented" />
-
     <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_notification"
         android:title="@string/settings_notifications"
@@ -62,4 +56,4 @@
         app:fragment="im.vector.app.features.settings.legals.LegalsFragment"
         app:isPreferenceVisible="@bool/settings_root_legals_visible" />
 
-</androidx.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>