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

Commits:

2 changed files:

Changes:

  • fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt
    ... ... @@ -46,11 +46,12 @@ class CustomizationFragment : PreferenceFragmentCompat() {
    46 46
         }
    
    47 47
     
    
    48 48
         private fun setupPreferences() {
    
    49
    -        bindFollowDeviceTheme()
    
    50
    -        bindDarkTheme()
    
    51
    -        bindLightTheme()
    
    52
    -        bindAutoBatteryTheme()
    
    53
    -        setupRadioGroups()
    
    49
    +// Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076
    
    50
    +//        bindFollowDeviceTheme()
    
    51
    +//        bindDarkTheme()
    
    52
    +//        bindLightTheme()
    
    53
    +//        bindAutoBatteryTheme()
    
    54
    +//        setupRadioGroups()
    
    54 55
             setupToolbarCategory()
    
    55 56
             setupGesturesCategory()
    
    56 57
         }
    

  • fenix/app/src/main/res/xml/customization_preferences.xml
    ... ... @@ -4,32 +4,33 @@
    4 4
        - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
    
    5 5
     <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
    
    6 6
         xmlns:app="http://schemas.android.com/apk/res-auto">
    
    7
    -    <androidx.preference.PreferenceCategory
    
    8
    -        android:layout="@layout/preference_cat_style"
    
    9
    -        android:title="@string/preferences_theme"
    
    10
    -        app:iconSpaceReserved="false">
    
    11
    -        <org.mozilla.fenix.settings.RadioButtonPreference
    
    12
    -            android:defaultValue="@bool/underAPI28"
    
    13
    -            android:key="@string/pref_key_light_theme"
    
    14
    -            android:title="@string/preference_light_theme" />
    
    15
    -
    
    16
    -        <org.mozilla.fenix.settings.RadioButtonPreference
    
    17
    -            android:defaultValue="false"
    
    18
    -            android:key="@string/pref_key_dark_theme"
    
    19
    -            android:title="@string/preference_dark_theme" />
    
    20
    -
    
    21
    -        <org.mozilla.fenix.settings.RadioButtonPreference
    
    22
    -            android:defaultValue="false"
    
    23
    -            android:key="@string/pref_key_auto_battery_theme"
    
    24
    -            android:title="@string/preference_auto_battery_theme"
    
    25
    -            app:isPreferenceVisible="@bool/underAPI28" />
    
    26
    -
    
    27
    -        <org.mozilla.fenix.settings.RadioButtonPreference
    
    28
    -            android:defaultValue="@bool/API28"
    
    29
    -            android:key="@string/pref_key_follow_device_theme"
    
    30
    -            android:title="@string/preference_follow_device_theme"
    
    31
    -            app:isPreferenceVisible="@bool/API28" />
    
    32
    -    </androidx.preference.PreferenceCategory>
    
    7
    +<!-- Remove as part of tor-browser#42076 : https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076 -->
    
    8
    +<!--    <androidx.preference.PreferenceCategory-->
    
    9
    +<!--        android:layout="@layout/preference_cat_style"-->
    
    10
    +<!--        android:title="@string/preferences_theme"-->
    
    11
    +<!--        app:iconSpaceReserved="false">-->
    
    12
    +<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
    
    13
    +<!--            android:defaultValue="@bool/underAPI28"-->
    
    14
    +<!--            android:key="@string/pref_key_light_theme"-->
    
    15
    +<!--            android:title="@string/preference_light_theme" />-->
    
    16
    +<!---->
    
    17
    +<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
    
    18
    +<!--            android:defaultValue="false"-->
    
    19
    +<!--            android:key="@string/pref_key_dark_theme"-->
    
    20
    +<!--            android:title="@string/preference_dark_theme" />-->
    
    21
    +<!---->
    
    22
    +<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
    
    23
    +<!--            android:defaultValue="false"-->
    
    24
    +<!--            android:key="@string/pref_key_auto_battery_theme"-->
    
    25
    +<!--            android:title="@string/preference_auto_battery_theme"-->
    
    26
    +<!--            app:isPreferenceVisible="@bool/underAPI28" />-->
    
    27
    +<!---->
    
    28
    +<!--        <org.mozilla.fenix.settings.RadioButtonPreference-->
    
    29
    +<!--            android:defaultValue="@bool/API28"-->
    
    30
    +<!--            android:key="@string/pref_key_follow_device_theme"-->
    
    31
    +<!--            android:title="@string/preference_follow_device_theme"-->
    
    32
    +<!--            app:isPreferenceVisible="@bool/API28" />-->
    
    33
    +<!--    </androidx.preference.PreferenceCategory>-->
    
    33 34
     
    
    34 35
         <androidx.preference.PreferenceCategory
    
    35 36
             android:layout="@layout/preference_cat_style"