Commits:
3 changed files:
Changes:
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
... |
... |
@@ -218,13 +218,13 @@ open class DefaultToolbarMenu( |
218
|
218
|
onItemTapped.invoke(ToolbarMenu.Item.NewTorCircuit)
|
219
|
219
|
}
|
220
|
220
|
|
221
|
|
- //private val historyItem = BrowserMenuImageText(
|
222
|
|
- // context.getString(R.string.library_history),
|
223
|
|
- // R.drawable.ic_history,
|
224
|
|
- // primaryTextColor()
|
225
|
|
- //) {
|
226
|
|
- // onItemTapped.invoke(ToolbarMenu.Item.History)
|
227
|
|
- //}
|
|
221
|
+ private val historyItem = BrowserMenuImageText(
|
|
222
|
+ context.getString(R.string.library_history),
|
|
223
|
+ R.drawable.ic_history,
|
|
224
|
+ primaryTextColor(),
|
|
225
|
+ ) {
|
|
226
|
+ onItemTapped.invoke(ToolbarMenu.Item.History)
|
|
227
|
+ }
|
228
|
228
|
|
229
|
229
|
private val downloadsItem = BrowserMenuImageText(
|
230
|
230
|
context.getString(R.string.library_downloads),
|
... |
... |
@@ -419,7 +419,7 @@ open class DefaultToolbarMenu( |
419
|
419
|
newCircuitItem,
|
420
|
420
|
BrowserMenuDivider(),
|
421
|
421
|
bookmarksItem,
|
422
|
|
- //historyItem,
|
|
422
|
+ if (context.settings().shouldDisableNormalMode) null else historyItem,
|
423
|
423
|
downloadsItem,
|
424
|
424
|
passwordsItem,
|
425
|
425
|
extensionsItem,
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
... |
... |
@@ -131,13 +131,13 @@ class HomeMenu( |
131
|
131
|
onItemTapped.invoke(Item.Bookmarks)
|
132
|
132
|
}
|
133
|
133
|
|
134
|
|
- // val historyItem = BrowserMenuImageText(
|
135
|
|
- // context.getString(R.string.library_history),
|
136
|
|
- // R.drawable.ic_history,
|
137
|
|
- // primaryTextColor,
|
138
|
|
- // ) {
|
139
|
|
- // onItemTapped.invoke(Item.History)
|
140
|
|
- // }
|
|
134
|
+ val historyItem = BrowserMenuImageText(
|
|
135
|
+ context.getString(R.string.library_history),
|
|
136
|
+ R.drawable.ic_history,
|
|
137
|
+ primaryTextColor,
|
|
138
|
+ ) {
|
|
139
|
+ onItemTapped.invoke(Item.History)
|
|
140
|
+ }
|
141
|
141
|
|
142
|
142
|
val downloadsItem = BrowserMenuImageText(
|
143
|
143
|
context.getString(R.string.library_downloads),
|
... |
... |
@@ -228,7 +228,7 @@ class HomeMenu( |
228
|
228
|
|
229
|
229
|
val menuItems = listOfNotNull(
|
230
|
230
|
bookmarksItem,
|
231
|
|
- //historyItem,
|
|
231
|
+ if (context.settings().shouldDisableNormalMode) null else historyItem,
|
232
|
232
|
downloadsItem,
|
233
|
233
|
passwordsItem,
|
234
|
234
|
// extensionsItem,
|
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
... |
... |
@@ -251,9 +251,11 @@ class SettingsFragment : PreferenceFragmentCompat() { |
251
|
251
|
getString(R.string.delete_browsing_data_quit_off)
|
252
|
252
|
}
|
253
|
253
|
|
254
|
|
- val tabSettingsPreference =
|
255
|
|
- requirePreference<Preference>(R.string.pref_key_tabs)
|
256
|
|
- tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString()
|
|
254
|
+ if (!settings.shouldDisableNormalMode) {
|
|
255
|
+ val tabSettingsPreference =
|
|
256
|
+ requirePreference<Preference>(R.string.pref_key_tabs)
|
|
257
|
+ tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString()
|
|
258
|
+ }
|
257
|
259
|
|
258
|
260
|
// val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)
|
259
|
261
|
// autofillPreference.title = if (settings.addressFeature) {
|
|