Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
-
3768f68b
by clairehurst at 2024-04-16T14:32:55-06:00
3 changed files:
- android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
- fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
- fenix/app/src/main/res/layout/tor_network_settings_beta_connection_features.xml
Changes:
| ... | ... | @@ -258,7 +258,7 @@ data class DefaultSettings( |
| 258 | 258 | override var cookieBannerHandlingDetectOnlyMode: Boolean = false,
|
| 259 | 259 | override var torSecurityLevel: Int = 4,
|
| 260 | 260 | override var spoofEnglish: Boolean = false,
|
| 261 | - override var useNewBootstrap: Boolean = false,
|
|
| 261 | + override var useNewBootstrap: Boolean = true,
|
|
| 262 | 262 | ) : Settings()
|
| 263 | 263 | |
| 264 | 264 | class UnsupportedSetting<T> {
|
| ... | ... | @@ -1857,16 +1857,16 @@ class Settings(private val appContext: Context) : PreferencesHolder { |
| 1857 | 1857 | |
| 1858 | 1858 | var useNewBootstrap by booleanPreference(
|
| 1859 | 1859 | appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap),
|
| 1860 | - default = false,
|
|
| 1860 | + default = true,
|
|
| 1861 | 1861 | )
|
| 1862 | 1862 | |
| 1863 | 1863 | var useNewBootstrapNativeUi by booleanPreference(
|
| 1864 | 1864 | appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap_with_android_native),
|
| 1865 | - default = false,
|
|
| 1865 | + default = true,
|
|
| 1866 | 1866 | )
|
| 1867 | 1867 | |
| 1868 | 1868 | var useNewBootstrapHtmlUi by booleanPreference(
|
| 1869 | 1869 | appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap_with_html),
|
| 1870 | - default = true
|
|
| 1870 | + default = false
|
|
| 1871 | 1871 | )
|
| 1872 | 1872 | } |
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 | app:layout_constraintTop_toBottomOf="@id/enable_beta_connection_features_summary">
|
| 61 | 61 | |
| 62 | 62 | <org.mozilla.fenix.settings.PreferenceBackedRadioButton
|
| 63 | - android:id="@+id/use_new_bootstrap_with_html_ui_radio_button"
|
|
| 63 | + android:id="@+id/use_new_bootstrap_with_native_ui_radio_button"
|
|
| 64 | 64 | android:layout_width="match_parent"
|
| 65 | 65 | android:layout_height="wrap_content"
|
| 66 | 66 | android:background="?android:attr/selectableItemBackground"
|
| ... | ... | @@ -70,15 +70,15 @@ |
| 70 | 70 | android:paddingTop="@dimen/radio_button_preference_vertical"
|
| 71 | 71 | android:paddingEnd="@dimen/radio_button_preference_horizontal"
|
| 72 | 72 | android:paddingBottom="@dimen/radio_button_preference_vertical"
|
| 73 | - android:text="HTML UI"
|
|
| 73 | + android:text="Native Android UI"
|
|
| 74 | 74 | android:textAppearance="?android:attr/textAppearanceListItem"
|
| 75 | 75 | android:textSize="16sp"
|
| 76 | 76 | app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
|
| 77 | - app:preferenceKey="@string/pref_key_use_new_bootstrap_with_html"
|
|
| 77 | + app:preferenceKey="@string/pref_key_use_new_bootstrap_with_android_native"
|
|
| 78 | 78 | app:preferenceKeyDefaultValue="true" />
|
| 79 | 79 | |
| 80 | 80 | <org.mozilla.fenix.settings.PreferenceBackedRadioButton
|
| 81 | - android:id="@+id/use_new_bootstrap_with_native_ui_radio_button"
|
|
| 81 | + android:id="@+id/use_new_bootstrap_with_html_ui_radio_button"
|
|
| 82 | 82 | android:layout_width="match_parent"
|
| 83 | 83 | android:layout_height="48dp"
|
| 84 | 84 | android:background="?android:attr/selectableItemBackground"
|
| ... | ... | @@ -88,11 +88,11 @@ |
| 88 | 88 | android:paddingTop="@dimen/radio_button_preference_vertical"
|
| 89 | 89 | android:paddingEnd="@dimen/radio_button_preference_horizontal"
|
| 90 | 90 | android:paddingBottom="@dimen/radio_button_preference_vertical"
|
| 91 | - android:text="Native Android UI"
|
|
| 91 | + android:text="HTML UI"
|
|
| 92 | 92 | android:textAppearance="?android:attr/textAppearanceListItem"
|
| 93 | 93 | android:textSize="16sp"
|
| 94 | 94 | app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
|
| 95 | - app:preferenceKey="@string/pref_key_use_new_bootstrap_with_android_native"
|
|
| 95 | + app:preferenceKey="@string/pref_key_use_new_bootstrap_with_html"
|
|
| 96 | 96 | app:preferenceKeyDefaultValue="false" />
|
| 97 | 97 | </RadioGroup>
|
| 98 | 98 |