For #19590 - Enable credit card autofill in Debug and Nightly (#19601)

app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt

@@ -30,12 +30,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
 
-        requirePreference<SwitchPreference>(R.string.pref_key_show_credit_cards_feature).apply {
-            isVisible = FeatureFlags.creditCardsFeature
-            isChecked = context.settings().creditCardsFeature
-            onPreferenceChangeListener = SharedPreferenceUpdater()
-        }
-
         requirePreference<SwitchPreference>(R.string.pref_key_new_tabs_tray).apply {
             isVisible = FeatureFlags.tabsTrayRewrite
             isChecked = context.settings().tabsTrayRewrite

app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

@@ -37,6 +37,7 @@ import mozilla.components.concept.sync.Profile
 import mozilla.components.support.ktx.android.view.showKeyboard
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -439,7 +440,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         with(requireContext().settings()) {
             findPreference<Preference>(
                 getPreferenceKey(R.string.pref_key_credit_cards)
-            )?.isVisible = creditCardsFeature
+            )?.isVisible = FeatureFlags.creditCardsFeature
             findPreference<Preference>(
                 getPreferenceKey(R.string.pref_key_nimbus_experiments)
             )?.isVisible = showSecretDebugMenuThisSession

app/src/main/java/org/mozilla/fenix/utils/Settings.kt

@@ -1042,12 +1042,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = true
     )
 
-    var creditCardsFeature by featureFlagPreference(
-        appContext.getPreferenceKey(R.string.pref_key_show_credit_cards_feature),
-        default = false,
-        featureFlag = FeatureFlags.creditCardsFeature
-    )
-
     var addressFeature by featureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_show_address_feature),
         default = false,

app/src/main/res/values/preference_keys.xml

@@ -278,7 +278,6 @@
     <string name="pref_key_search_region_current" translatable="false">pref_key_search_region_current</string>
 
     <!-- Secret Settings -->
-    <string name="pref_key_show_credit_cards_feature" translatable="false">pref_key_show_credit_cards_feature</string>
     <string name="pref_key_show_address_feature" translatable="false">pref_key_show_address_feature</string>
     <string name="pref_key_nimbus_experiments" translatable="false">pref_key_nimbus_experiments</string>
 </resources>

app/src/main/res/values/static_strings.xml

@@ -37,8 +37,6 @@
     <string name="preferences_debug_info" translatable="false">Secret Debug Info</string>
     <!-- Label for enabling Address Autofill -->
     <string name="preferences_debug_settings_enable_address_feature" translatable="false">Enable Address Autofill</string>
-    <!-- Label for enabling Credit Card Autofill -->
-    <string name="preferences_debug_settings_enable_credit_cards_feature" translatable="false">Enable Credit Card Autofill</string>
     <!-- Label for the new tabs tray preference -->
     <string name="preferences_debug_settings_tabs_tray_rewrite">Use new Tabs Tray</string>
     <!-- Label for a longer description of the new tabs tray preference -->

app/src/main/res/xml/secret_settings_preferences.xml

@@ -9,11 +9,6 @@
         android:key="@string/pref_key_show_address_feature"
         android:title="@string/preferences_debug_settings_enable_address_feature"
         app:iconSpaceReserved="false" />
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/pref_key_show_credit_cards_feature"
-        android:title="@string/preferences_debug_settings_enable_credit_cards_feature"
-        app:iconSpaceReserved="false" />
     <SwitchPreference
         android:defaultValue="false"
         android:key="@string/pref_key_new_tabs_tray"