[tor-commits] [Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX

[Dan Ballard (@dan)]

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android


Commits:
d19b676f by clairehurst at 2023-09-11T23:51:22+00:00
fixup! Modify UI/UX

Bug 42076: Remove theme options from UI

- - - - -


2 changed files:

- fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
- fenix/app/src/main/res/xml/customization_preferences.xml


Changes:

=====================================
fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
=====================================
@@ -46,11 +46,12 @@ class CustomizationFragment : PreferenceFragmentCompat() {
     }
 
     private fun setupPreferences() {
-        bindFollowDeviceTheme()
-        bindDarkTheme()
-        bindLightTheme()
-        bindAutoBatteryTheme()
-        setupRadioGroups()
+// Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076
+//        bindFollowDeviceTheme()
+//        bindDarkTheme()
+//        bindLightTheme()
+//        bindAutoBatteryTheme()
+//        setupRadioGroups()
         setupToolbarCategory()
         setupGesturesCategory()
     }


=====================================
fenix/app/src/main/res/xml/customization_preferences.xml
=====================================
@@ -4,32 +4,33 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_cat_style"
-        android:title="@string/preferences_theme"
-        app:iconSpaceReserved="false">
-        <org.mozilla.fenix.settings.RadioButtonPreference
-            android:defaultValue="@bool/underAPI28"
-            android:key="@string/pref_key_light_theme"
-            android:title="@string/preference_light_theme" />
-
-        <org.mozilla.fenix.settings.RadioButtonPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_dark_theme"
-            android:title="@string/preference_dark_theme" />
-
-        <org.mozilla.fenix.settings.RadioButtonPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_auto_battery_theme"
-            android:title="@string/preference_auto_battery_theme"
-            app:isPreferenceVisible="@bool/underAPI28" />
-
-        <org.mozilla.fenix.settings.RadioButtonPreference
-            android:defaultValue="@bool/API28"
-            android:key="@string/pref_key_follow_device_theme"
-            android:title="@string/preference_follow_device_theme"
-            app:isPreferenceVisible="@bool/API28" />
-    </androidx.preference.PreferenceCategory>
+<!-- Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076 -->
+<!--    <androidx.preference.PreferenceCategory-->
+<!--        android:layout="@layout/preference_cat_style"-->
+<!--        android:title="@string/preferences_theme"-->
+<!--        app:iconSpaceReserved="false">-->
+<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!--            android:defaultValue="@bool/underAPI28"-->
+<!--            android:key="@string/pref_key_light_theme"-->
+<!--            android:title="@string/preference_light_theme" />-->
+<!---->
+<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!--            android:defaultValue="false"-->
+<!--            android:key="@string/pref_key_dark_theme"-->
+<!--            android:title="@string/preference_dark_theme" />-->
+<!---->
+<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!--            android:defaultValue="false"-->
+<!--            android:key="@string/pref_key_auto_battery_theme"-->
+<!--            android:title="@string/preference_auto_battery_theme"-->
+<!--            app:isPreferenceVisible="@bool/underAPI28" />-->
+<!---->
+<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
+<!--            android:defaultValue="@bool/API28"-->
+<!--            android:key="@string/pref_key_follow_device_theme"-->
+<!--            android:title="@string/preference_follow_device_theme"-->
+<!--            app:isPreferenceVisible="@bool/API28" />-->
+<!--    </androidx.preference.PreferenceCategory>-->
 
     <androidx.preference.PreferenceCategory
         android:layout="@layout/preference_cat_style"



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/d19b676f148dade33eea6dd64cf54df7d4f52c3c
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/tor-commits/attachments/20230911/4d926a00/attachment-0001.htm>