morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
    ... ... @@ -255,12 +255,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
    255 255
                 requirePreference<Preference>(R.string.pref_key_tabs)
    
    256 256
             tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString()
    
    257 257
     
    
    258
    -        val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)
    
    259
    -        autofillPreference.title = if (settings.addressFeature) {
    
    260
    -            getString(R.string.preferences_autofill)
    
    261
    -        } else {
    
    262
    -            getString(R.string.preferences_credit_cards_2)
    
    263
    -        }
    
    258
    +//        val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)
    
    259
    +//        autofillPreference.title = if (settings.addressFeature) {
    
    260
    +//            getString(R.string.preferences_autofill)
    
    261
    +//        } else {
    
    262
    +//            getString(R.string.preferences_credit_cards_2)
    
    263
    +//        }
    
    264 264
     
    
    265 265
     //        val openLinksInAppsSettingsPreference =
    
    266 266
     //            requirePreference<Preference>(R.string.pref_key_open_links_in_apps)
    
    ... ... @@ -329,10 +329,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
    329 329
                     SettingsFragmentDirections.actionSettingsFragmentToSavedLoginsAuthFragment()
    
    330 330
                 }
    
    331 331
     
    
    332
    -            resources.getString(R.string.pref_key_credit_cards) -> {
    
    333
    -                SettingsMetrics.autofill.record()
    
    334
    -                SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()
    
    335
    -            }
    
    332
    +//            resources.getString(R.string.pref_key_credit_cards) -> {
    
    333
    +//                SettingsMetrics.autofill.record()
    
    334
    +//                SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()
    
    335
    +//            }
    
    336 336
     
    
    337 337
                 resources.getString(R.string.pref_key_accessibility) -> {
    
    338 338
                     SettingsFragmentDirections.actionSettingsFragmentToAccessibilityFragment()
    

  • mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
    ... ... @@ -1657,7 +1657,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
    1657 1657
          */
    
    1658 1658
         var shouldAutofillCreditCardDetails by booleanPreference(
    
    1659 1659
             appContext.getPreferenceKey(R.string.pref_key_credit_cards_save_and_autofill_cards),
    
    1660
    -        default = true,
    
    1660
    +        default = BuildConfig.DATA_COLLECTION_DISABLED == false,
    
    1661 1661
         )
    
    1662 1662
     
    
    1663 1663
         /**