Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project
/ Applications / firefox-android
Commits:
06e63c65 by clairehurst at 2023-12-05T14:58:25-07:00
fixup! Modify UI/UX
- - - - -
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,12 +46,11 @@ class CustomizationFragment : PreferenceFragmentCompat() {
}
private fun setupPreferences() {
-// Remove as part of tor-browser#42076 :
https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42076
-// bindFollowDeviceTheme()
-// bindDarkTheme()
-// bindLightTheme()
-// bindAutoBatteryTheme()
-// setupRadioGroups()
+ bindFollowDeviceTheme()
+ bindDarkTheme()
+ bindLightTheme()
+ bindAutoBatteryTheme()
+ setupRadioGroups()
setupToolbarCategory()
setupGesturesCategory()
}
=====================================
fenix/app/src/main/res/xml/customization_preferences.xml
=====================================
@@ -4,33 +4,32 @@
- 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";>
-<!-- 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"
+ 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/06e63c6584852e0218600f4ea62ec7d71a1e23ae
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/06e63c6584852e0218600f4ea62ec7d71a1e23ae
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
