[tbb-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] add to fixup! Enable the connect assist experiments on alpha

[Dan Ballard (@dan)]

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
add to fixup! Enable the connect assist experiments on alpha

- - - - -


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:

=====================================
android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
=====================================
@@ -258,7 +258,7 @@ data class DefaultSettings(
     override var cookieBannerHandlingDetectOnlyMode: Boolean = false,
     override var torSecurityLevel: Int = 4,
     override var spoofEnglish: Boolean = false,
-    override var useNewBootstrap: Boolean = false,
+    override var useNewBootstrap: Boolean = true,
 ) : Settings()
 
 class UnsupportedSetting<T> {


=====================================
fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
=====================================
@@ -1857,16 +1857,16 @@ class Settings(private val appContext: Context) : PreferencesHolder {
 
     var useNewBootstrap by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap),
-        default = false,
+        default = true,
     )
 
     var useNewBootstrapNativeUi by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap_with_android_native),
-        default = false,
+        default = true,
     )
 
     var useNewBootstrapHtmlUi by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_use_new_bootstrap_with_html),
-        default = true
+        default = false
     )
 }


=====================================
fenix/app/src/main/res/layout/tor_network_settings_beta_connection_features.xml
=====================================
@@ -60,7 +60,7 @@
         app:layout_constraintTop_toBottomOf="@id/enable_beta_connection_features_summary">
 
         <org.mozilla.fenix.settings.PreferenceBackedRadioButton
-            android:id="@+id/use_new_bootstrap_with_html_ui_radio_button"
+            android:id="@+id/use_new_bootstrap_with_native_ui_radio_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackground"
@@ -70,15 +70,15 @@
             android:paddingTop="@dimen/radio_button_preference_vertical"
             android:paddingEnd="@dimen/radio_button_preference_horizontal"
             android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:text="HTML UI"
+            android:text="Native Android UI"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textSize="16sp"
             app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-            app:preferenceKey="@string/pref_key_use_new_bootstrap_with_html"
+            app:preferenceKey="@string/pref_key_use_new_bootstrap_with_android_native"
             app:preferenceKeyDefaultValue="true" />
 
         <org.mozilla.fenix.settings.PreferenceBackedRadioButton
-            android:id="@+id/use_new_bootstrap_with_native_ui_radio_button"
+            android:id="@+id/use_new_bootstrap_with_html_ui_radio_button"
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:background="?android:attr/selectableItemBackground"
@@ -88,11 +88,11 @@
             android:paddingTop="@dimen/radio_button_preference_vertical"
             android:paddingEnd="@dimen/radio_button_preference_horizontal"
             android:paddingBottom="@dimen/radio_button_preference_vertical"
-            android:text="Native Android UI"
+            android:text="HTML UI"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textSize="16sp"
             app:drawableStartCompat="?android:attr/listChoiceIndicatorSingle"
-            app:preferenceKey="@string/pref_key_use_new_bootstrap_with_android_native"
+            app:preferenceKey="@string/pref_key_use_new_bootstrap_with_html"
             app:preferenceKeyDefaultValue="false" />
     </RadioGroup>
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/3768f68b80b6903b886a7d0e92104c1fd018bb05

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/3768f68b80b6903b886a7d0e92104c1fd018bb05
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240416/6feff69a/attachment-0001.htm>