morgan pushed to branch tor-browser-128.4.0esr-14.5-1 at The Tor Project /
Applications / Tor Browser
Commits:
474dd858 by cypherpunks1 at 2024-10-29T21:13:24+00:00
fixup! [android] Modify UI/UX
Bug 43241: Improve hiding non-private tab features on Android
- - - - -
3 changed files:
-
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
- mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
-
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
Changes:
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
=====================================
@@ -218,13 +218,13 @@ open class DefaultToolbarMenu(
onItemTapped.invoke(ToolbarMenu.Item.NewTorCircuit)
}
- //private val historyItem = BrowserMenuImageText(
- // context.getString(R.string.library_history),
- // R.drawable.ic_history,
- // primaryTextColor()
- //) {
- // onItemTapped.invoke(ToolbarMenu.Item.History)
- //}
+ private val historyItem = BrowserMenuImageText(
+ context.getString(R.string.library_history),
+ R.drawable.ic_history,
+ primaryTextColor(),
+ ) {
+ onItemTapped.invoke(ToolbarMenu.Item.History)
+ }
private val downloadsItem = BrowserMenuImageText(
context.getString(R.string.library_downloads),
@@ -419,7 +419,7 @@ open class DefaultToolbarMenu(
newCircuitItem,
BrowserMenuDivider(),
bookmarksItem,
- //historyItem,
+ if (context.settings().shouldDisableNormalMode) null else
historyItem,
downloadsItem,
passwordsItem,
extensionsItem,
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
=====================================
@@ -131,13 +131,13 @@ class HomeMenu(
onItemTapped.invoke(Item.Bookmarks)
}
- // val historyItem = BrowserMenuImageText(
- // context.getString(R.string.library_history),
- // R.drawable.ic_history,
- // primaryTextColor,
- // ) {
- // onItemTapped.invoke(Item.History)
- // }
+ val historyItem = BrowserMenuImageText(
+ context.getString(R.string.library_history),
+ R.drawable.ic_history,
+ primaryTextColor,
+ ) {
+ onItemTapped.invoke(Item.History)
+ }
val downloadsItem = BrowserMenuImageText(
context.getString(R.string.library_downloads),
@@ -228,7 +228,7 @@ class HomeMenu(
val menuItems = listOfNotNull(
bookmarksItem,
- //historyItem,
+ if (context.settings().shouldDisableNormalMode) null else
historyItem,
downloadsItem,
passwordsItem,
// extensionsItem,
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
=====================================
@@ -251,9 +251,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
getString(R.string.delete_browsing_data_quit_off)
}
- val tabSettingsPreference =
- requirePreference<Preference>(R.string.pref_key_tabs)
- tabSettingsPreference.summary =
context?.settings()?.getTabTimeoutString()
+ if (!settings.shouldDisableNormalMode) {
+ val tabSettingsPreference =
+ requirePreference<Preference>(R.string.pref_key_tabs)
+ tabSettingsPreference.summary =
context?.settings()?.getTabTimeoutString()
+ }
// val autofillPreference =
requirePreference<Preference>(R.string.pref_key_credit_cards)
// autofillPreference.title = if (settings.addressFeature) {
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/474dd858bf54083297490b27223b9015d65cb79c
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/474dd858bf54083297490b27223b9015d65cb79c
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-commits
