Commit e406b050 authored by Dan Ballard's avatar Dan Ballard Committed by morgan
Browse files

fixup! [android] Disable features and functionality 

Bug 43043: Remove credit card autofil ui elements from menu
parent 4cf9c328

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

+10 −10
Original line number Diff line number Diff line
@@ -255,12 +255,12 @@ class SettingsFragment : PreferenceFragmentCompat() { 
            requirePreference<Preference>(R.string.pref_key_tabs)

        tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString()



        val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)

        autofillPreference.title = if (settings.addressFeature) {

            getString(R.string.preferences_autofill)

        } else {

            getString(R.string.preferences_credit_cards_2)

        }

//        val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)

//        autofillPreference.title = if (settings.addressFeature) {

//            getString(R.string.preferences_autofill)

//        } else {

//            getString(R.string.preferences_credit_cards_2)

//        }



//        val openLinksInAppsSettingsPreference =

//            requirePreference<Preference>(R.string.pref_key_open_links_in_apps)
@@ -329,10 +329,10 @@ class SettingsFragment : PreferenceFragmentCompat() { 
                SettingsFragmentDirections.actionSettingsFragmentToSavedLoginsAuthFragment()

            }



            resources.getString(R.string.pref_key_credit_cards) -> {

                SettingsMetrics.autofill.record()

                SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()

            }

//            resources.getString(R.string.pref_key_credit_cards) -> {

//                SettingsMetrics.autofill.record()

//                SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()

//            }



            resources.getString(R.string.pref_key_accessibility) -> {

                SettingsFragmentDirections.actionSettingsFragmentToAccessibilityFragment()

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

+1 −1
Original line number Diff line number Diff line
@@ -1657,7 +1657,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { 
     */

    var shouldAutofillCreditCardDetails by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_credit_cards_save_and_autofill_cards),

        default = true,

        default = BuildConfig.DATA_COLLECTION_DISABLED == false,

    )



    /**