Skip to content
GitLab
Commit bac84265 authored by MozLando's avatar MozLando
Browse files

Merge #7724 #7735 



7724: Issue #7723: FullScreenFeature: Do not invoke callbacks for initial state. r=rocketsroger a=pocmo



7735: Import strings from android-l10n. r=pocmo a=mozilla-l10n-automation-bot

n/t
Co-authored-by: default avatarSebastian Kaspari <s.kaspari@gmail.com>
Co-authored-by: default avatarMozilla L10n Automation Bot <release+l10n-automation-bot@mozilla.com>
parents 0c1233a9 210e3a46 743acf82
Hide whitespace changes
Inline Side-by-side
components/browser/errorpages/src/main/res/values-su/strings.xml
View file @ bac84265
......@@ -89,7 +89,7 @@
<string name="mozac_browser_errorpages_redirect_loop_title">Kacana teu bener kaalihkeunna</string>
<!-- The error message shown when the browser gets stuck in an infinite loop when loading a website. -->
<string name="mozac_browser_errorpages_redirect_loop_message"><![CDATA[<p>Panyungsi eureun nyobaan mulut hal anu direkéskeun. Lokana ngarahkeun rekésna nepi ka moal anggeus-anggeus.</p>
<string name="mozac_browser_errorpages_redirect_loop_message"><![CDATA[<p>Pamaluruh eureun nyobaan mulut hal anu direkéskeun. Lokana ngarahkeun rekésna nepi ka moal anggeus-anggeus.</p>
<ul>
<li>Anjeun numpurkeun atawa meungpeuk réréméh anu dipénta ku ieu loka?</li>
<li>Lamun teu bisa bérés ku nampa réréméh loka, sigana masalahna dina konpigurasi serper sarta lain tina piranti anjeun.</li>
......
components/browser/errorpages/src/main/res/values-trs/strings.xml
View file @ bac84265
......@@ -151,4 +151,68 @@
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_unknown_host_title">Nu nārì\'ìj dīreksiûn</string>
<!-- In the example, the two URLs in markup do not need to be translated. -->
<string name="mozac_browser_errorpages_unknown_host_message"><![CDATA[<p>Nu ga\'ue narì\' riña sā nana\'uî\'t \'ngō servidor guendâ direksiûn gachrûnt.</p>
<ul>
<li>Gīni\'iāj si nu gāchrūn hue\'êt, dàj rû\':
<strong>ww</strong>.example.com luguâ gāchrūnt
<strong>www</strong>.example.com.</li>
<li>Sisī na\'ue nāyi\'nïn riña gà\' si \'ngō pâjina, ni\'iāj si huā internet riña si āgà\'t li.</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_no_internet_title">Nitāj internet hua</string>
<!-- The main body text of this error page. It will be shown beneath the title -->
<string name="mozac_browser_errorpages_no_internet_message">Nātsij ni\'iājt sisī huā internet asi ginù huin ñû nā\'nïnt riña nanâ doj sínj.</string>
<!-- Text that will show up on the button at the bottom of the error page -->
<string name="mozac_browser_errorpages_no_internet_refresh_button">Nā\'nïn ñû</string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_malformed_uri_title">Nitāj si huā hue\'ê direksiûn gachrûnt</string>
<string name="mozac_browser_errorpages_malformed_uri_message"><![CDATA[<p>Nu nārì\'t dà gāchrūnt direksiûn. Ni\'iāj dānè gachrûn a\'nâ\'t nī nāchrūn hue\'ê man.</p>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_malformed_uri_title_alternative">Nitāj si huā hue\'ê direksiûn gachrûnt</string>
<!-- This string contains markup. The URL should not be localized. -->
<string name="mozac_browser_errorpages_malformed_uri_message_alternative"><![CDATA[<ul>
<li>Huā da\'āj nī achrûn\' \'ngō dīreksiûn dànanj <strong>http://www.example.com/</strong></li>
<li>Ni\'iāj hue\'ê sisī arâj sunt huìj chrun li nīkïn\' nītïn dan ân (dàj rû\' <strong>/</strong>).</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_unknown_protocol_title">Sê dànanj gāchrūn\'</string>
<string name="mozac_browser_errorpages_unknown_protocol_message"><![CDATA[<p>Dàj gāchrūn\' \'ngō dīreksiûn (dàj rû\', <q>wxyz://</q>) da\' nāni\'in riña sā nana\'uî\'t, si nitāj nī si na\'nïn riña sitiô ruhuât gātūt.</p>
<ul>
<li>Sī gātūt riña \'ngō hiūj sê sa achrû\' huin anj. Gīni\'iāj nùj huin doj sa achín sitiô dan ân.</li>
<li>Huā da\'āj nej man nī ni\'ña \'ngō software asi plūyîn da\' ga\'ue nāni\'in sa riñā nana\'uî\'t man.</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_file_not_found_title">Nu nārì\'ij archîbo</string>
<string name="mozac_browser_errorpages_file_not_found_message"><![CDATA[<ul>
<li>Nadunâ si yūgui man, nare\' man asi nadunâ man riña hūa aj.</li>
<li>Nu gāchrūn hue\'êt, asi garâj sunt mayûskula asi a\'ngô sa huā a\'nan\' gachrûnt riña dīreksiûn anj.</li>
<li>Giri\' nì\'iát da\' gātūt hiūj nan bè\'ej.</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_file_access_denied_title">Nu ga\'ue gā\'nïn gātūt riña archîbo</string>
<string name="mozac_browser_errorpages_file_access_denied_message"><![CDATA[<ul>
<li>Ga\'ue si nare\'ej asi ganatu a\'ngô hiūj u, asi nu gīrì\' nì\'iát riña archîbo da\' gātūt riñaj.</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_proxy_connection_refused_title">Nu gā\'nïn servidor proxy gātūt</string>
<string name="mozac_browser_errorpages_proxy_connection_refused_message"><![CDATA[<p>Huā nî\'nïn riña sā nana\'uî\'t dan da\' gārāsunj \'ngō servidor proxy, sanī proxy nu gā\'nïn gātūt.</p>
<ul>
<li>Huā hue\'ê proxy riña sa riñā nana\'uî\'t bè\'ej. Nātsij ni\'iājt nī ginù huin ñû gātūt.</li>
<li>Ga\'ue gātūt hiūj nan tāj proxy bè\'ej.</li>
<li>Huā nï\' iaj chij aj. Gīni\'iāj gā\'mīnt ngà duguî\' dû\'uèj internet asi sû\' nīkāj ñu\'ūnj man da\' rūgûñu\'ūnj si sò\'.</li>
</ul>]]></string>
<!-- The document title and heading of an error page. -->
<string name="mozac_browser_errorpages_unknown_proxy_host_title">Nu nārì\'ij servidor proxy</string>
</resources>
components/feature/addons/src/main/res/values-mr/strings.xml
View file @ bac84265
......@@ -100,6 +100,8 @@
<string name="mozac_feature_addons_permissions_dialog_cancel">रद्द करा</string>
<!-- Accessibility content description to install add-on button. -->
<string name="mozac_feature_addons_install_addon_content_description">ॲड-ऑन प्रतिष्ठापीत करा</string>
<!-- This is the label of a button to cancel an ongoing add-on installation. -->
<string name="mozac_feature_addons_install_addon_dialog_cancel">रद्द करा</string>
<!-- Indicates how many users have rated an add-on. %1$s will be replaced with number of users -->
<string name="mozac_feature_addons_user_rating_count">वापरकर्ते: %1$s</string>
<!-- Accessibility content description for the amount of stars that add-on has, where %1$.02f will be the amount of stars and / separator and 5 the maximum number of stars e.g (2/5, 4.5/5 or 5/5) . -->
......@@ -178,4 +180,10 @@
<string name="mozac_feature_addons_updater_dialog_last_attempt">मागील प्रयत्न:</string>
<!-- Displayed in the "Status" field for the updater when an add-on has been correctly updated -->
<string name="mozac_feature_addons_updater_dialog_status">स्थिती:</string>
<!-- Text shown in the dialog when add-on installation is completed. %1$s is the add-on name. %2$s is the app name. -->
<string name="mozac_feature_addons_installed_dialog_title">%1$s हे %2$s मध्ये जोडले गेले आहे</string>
<!-- Text shown in the dialog when add-on installation is completed. %1$s is the add-on name. -->
<string name="mozac_feature_addons_installed_dialog_description">त्यास मेनू मध्ये उघडा</string>
<!-- Confirmation button text for the dialog when add-on installation is completed. -->
<string name="mozac_feature_addons_installed_dialog_okay_button">ठीक आहे, समजले</string>
</resources>
components/feature/contextmenu/src/main/res/values-mr/strings.xml
View file @ bac84265
......@@ -10,6 +10,8 @@
<string name="mozac_feature_contextmenu_download_link">डाउनलोड दुवा</string>
<!-- Text for context menu item to share the link with an other app. -->
<string name="mozac_feature_contextmenu_share_link">दुवा शेअर करा</string>
<!-- Text for context menu item to share the image with an other app. -->
<string name="mozac_feature_contextmenu_share_image">प्रतिमा सामयिक करा</string>
<!-- Text for context menu item to copy the link to the clipboard. -->
<string name="mozac_feature_contextmenu_copy_link">दुव्याची प्रत बनवा</string>
<!-- Text for context menu item to copy the URL pointing to the image to the clipboard. -->
......
components/feature/downloads/src/main/res/values-mr/strings.xml
View file @ bac84265
......@@ -23,6 +23,9 @@
<!-- Message that appears when the downloaded file could not be opened-->
<string name="mozac_feature_downloads_could_not_open_file">दस्तावेज उघडू शकले नाही</string>
<!-- Message that appears when the downloaded file is a specific type that Android doesn't support opening-->
<string name="mozac_feature_downloads_open_not_supported1">%1$s फाईल उघडण्यासाठी कुठलेही अॅप सापडले नाही</string>
<!-- Button that pauses the download when pressed -->
<string name="mozac_feature_downloads_button_pause">विराम</string>
<!-- Button that resumes the download when pressed -->
......
components/feature/prompts/src/main/res/values-mr/strings.xml
View file @ bac84265
......@@ -20,14 +20,20 @@
<string name="mozac_feature_prompt_dont_save">जतन करू नका</string>
<!-- Positive confirmation that we should save the new or updated login -->
<string name="mozac_feature_prompt_save_confirmation">जतन करा</string>
<!-- Negative confirmation that we should not save the updated login -->
<string name="mozac_feature_prompt_dont_update">अद्यावत करू नका</string>
<!-- Positive confirmation that we should save the updated login -->
<string name="mozac_feature_prompt_update_confirmation">अद्ययावत करा</string>
<!-- Error text displayed underneath the password field when it is in an error case -->
<string name="mozac_feature_prompt_error_empty_password">पासवर्ड क्षेत्र रिक्त नसावे</string>
<!-- Error text displayed underneath the password field when it is in an error case -->
<string name="mozac_feature_prompt_error_unknown_cause">लॉगिन जतन करण्यात अक्षम</string>
<!-- Prompt message displayed when app detects a user has entered a password and user decides if app should save it. The first parameter is the name of the application (For example: Fenix) -->
<string name="mozac_feature_prompt_logins_save_message">%s ने हे लॉगिन जतन करावे का?</string>
<!-- Prompt message displayed when app detects a user has entered a new username and password and user decides if app should save the new login. -->
<string name="mozac_feature_prompt_login_save_headline">हे लॉगिन जतन करायचे?</string>
<!-- Prompt message displayed when app detects a user has entered a new password for an existing login and user decides if app should update the login. -->
<string name="mozac_feature_prompt_login_update_headline">हे लॉगिन अद्यतन करायचे?</string>
<!-- Prompt message displayed when app detects a user has entered a username for an existing login without a username and user decides if app should update the login. -->
<string name="mozac_feature_prompt_login_add_username_headline">जतन केलेल्या संकेतशब्दामध्ये वापरकर्तानाव जोडायचे?</string>
<!-- Text for a label for the field when prompt requesting a text is shown. -->
<!-- For more info take a look here https://developer.mozilla.org/en-US/docs/Web/API/Window/prompt -->
<string name="mozac_feature_prompts_content_description_input_label">मजकूर इनपुट फील्ड प्रविष्ट करण्यासाठी लेबल</string>
......@@ -37,6 +43,14 @@
<string name="mozac_feature_prompts_allow">परवानगी द्या</string>
<!-- Text of a negative button in dialog requesting to open a new window. -->
<string name="mozac_feature_prompts_deny">नकारा</string>
<!-- Title of the dialog shown when a user is leaving a website and there is still data not saved yet. -->
<string name="mozac_feature_prompt_before_unload_dialog_title">आपणास खात्री आहे का?</string>
<!-- Body text of the dialog shown when a user is leaving a website and there is still data not saved yet. -->
<string name="mozac_feature_prompt_before_unload_dialog_body">आपण ही साइट सोडू इच्छिता? आपण प्रविष्ट केलेला डेटा कदाचित जतन केला जाणार नाही</string>
<!-- Stay button of the dialog shown when a user is leaving a website and there is still data not saved yet, this indicates that the user wants to stay in the website. -->
<string name="mozac_feature_prompts_before_unload_stay">थांबा</string>
<!-- Leave button of the dialog shown when a user is leaving a website and there is still data not saved yet, this indicates that the user wants to leave in the website. -->
<string name="mozac_feature_prompts_before_unload_leave">सोडा</string>
<!-- Title of the month chooser dialog. -->
<string name="mozac_feature_prompts_set_month">महिना निवडा</string>
<!-- January (short description), used on the month chooser dialog. -->
......
components/feature/session/src/main/java/mozilla/components/feature/session/FullScreenFeature.kt
View file @ bac84265
......@@ -27,7 +27,7 @@ open class FullScreenFeature(
private val fullScreenChanged: (Boolean) -> Unit
) : LifecycleAwareFeature, UserInteractionHandler {
private var scope: CoroutineScope? = null
private var observation: Observation? = null
private var observation: Observation = createDefaultObservation()
/**
* Starts the feature and a observer to listen for fullscreen changes.
......@@ -35,9 +35,9 @@ open class FullScreenFeature(
override fun start() {
scope = store.flowScoped { flow ->
flow.map { state -> state.findTabOrCustomTabOrSelectedTab(tabId) }
.map { tab -> tab?.toObservation() }
.map { tab -> tab.toObservation() }
.ifChanged()
.collect { foo -> onChange(foo) }
.collect { observation -> onChange(observation) }
}
}
......@@ -45,13 +45,13 @@ open class FullScreenFeature(
scope?.cancel()
}
private fun onChange(observation: Observation?) {
if (observation?.inFullScreen != this.observation?.inFullScreen) {
fullScreenChanged(observation?.inFullScreen ?: false)
private fun onChange(observation: Observation) {
if (observation.inFullScreen != this.observation.inFullScreen) {
fullScreenChanged(observation.inFullScreen)
}
if (observation?.layoutInDisplayCutoutMode != this.observation?.layoutInDisplayCutoutMode) {
viewportFitChanged(observation?.layoutInDisplayCutoutMode ?: 0)
if (observation.layoutInDisplayCutoutMode != this.observation.layoutInDisplayCutoutMode) {
viewportFitChanged(observation.layoutInDisplayCutoutMode)
}
this.observation = observation
......@@ -63,12 +63,13 @@ open class FullScreenFeature(
* @return Returns true if the fullscreen mode was successfully exited; false if no effect was taken.
*/
override fun onBackPressed(): Boolean {
observation?.let {
if (it.inFullScreen) {
sessionUseCases.exitFullscreen(it.tabId)
return true
}
val observation = observation
if (observation.inFullScreen && observation.tabId != null) {
sessionUseCases.exitFullscreen(observation.tabId)
return true
}
return false
}
}
......@@ -77,11 +78,21 @@ open class FullScreenFeature(
* Simple holder data class to keep a reference to the last values we observed.
*/
private data class Observation(
val tabId: String,
val tabId: String?,
val inFullScreen: Boolean,
val layoutInDisplayCutoutMode: Int
)
private fun SessionState.toObservation(): Observation {
return Observation(id, content.fullScreen, content.layoutInDisplayCutoutMode)
private fun SessionState?.toObservation(): Observation {
return if (this != null) {
Observation(id, content.fullScreen, content.layoutInDisplayCutoutMode)
} else {
createDefaultObservation()
}
}
private fun createDefaultObservation() = Observation(
tabId = null,
inFullScreen = false,
layoutInDisplayCutoutMode = 0
)
components/feature/session/src/test/java/mozilla/components/feature/session/FullScreenFeatureTest.kt
View file @ bac84265
......@@ -70,6 +70,33 @@ class FullScreenFeatureTest {
assertNull(fullscreen)
}
@Test
fun `Starting with selected tab will not invoke callbacks with default state`() {
var viewPort: Int? = null
var fullscreen: Boolean? = null
val store = BrowserStore(BrowserState(
tabs = listOf(createTab("https://www.mozilla.org", id = "A")),
selectedTabId = "A"
))
val feature = FullScreenFeature(
store = store,
sessionUseCases = mock(),
tabId = null,
viewportFitChanged = { value -> viewPort = value },
fullScreenChanged = { value -> fullscreen = value }
)
feature.start()
testDispatcher.advanceUntilIdle()
store.waitUntilIdle()
assertNull(viewPort)
assertNull(fullscreen)
}
@Test
fun `Starting with selected tab`() {
var viewPort: Int? = null
......@@ -80,6 +107,16 @@ class FullScreenFeatureTest {
selectedTabId = "A"
))
store.dispatch(ContentAction.FullScreenChangedAction(
"A",
true
)).joinBlocking()
store.dispatch(ContentAction.ViewportFitChangedAction(
"A",
42
)).joinBlocking()
val feature = FullScreenFeature(
store = store,
sessionUseCases = mock(),
......@@ -93,8 +130,8 @@ class FullScreenFeatureTest {
testDispatcher.advanceUntilIdle()
store.waitUntilIdle()
assertEquals(0, viewPort)
assertFalse(fullscreen!!)
assertEquals(42, viewPort)
assertTrue(fullscreen!!)
}
@Test
......@@ -122,7 +159,7 @@ class FullScreenFeatureTest {
true
)).joinBlocking()
assertEquals(0, viewPort)
assertNull(viewPort)
assertTrue(fullscreen!!)
}
......@@ -234,16 +271,26 @@ class FullScreenFeatureTest {
fullScreenChanged = { value -> fullscreen = value }
)
store.dispatch(ContentAction.FullScreenChangedAction(
"B",
true
)).joinBlocking()
store.dispatch(ContentAction.ViewportFitChangedAction(
"B",
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER
)).joinBlocking()
feature.start()
assertEquals(0, viewPort)
assertFalse(fullscreen!!)
assertEquals(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER, viewPort)
assertTrue(fullscreen!!)
feature.stop()
store.dispatch(ContentAction.FullScreenChangedAction(
"B",
true
false
)).joinBlocking()
store.dispatch(ContentAction.ViewportFitChangedAction(
......@@ -251,13 +298,13 @@ class FullScreenFeatureTest {
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
)).joinBlocking()
assertEquals(0, viewPort)
assertFalse(fullscreen!!)
assertEquals(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER, viewPort)
assertTrue(fullscreen!!)
feature.start()
assertEquals(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES, viewPort)
assertTrue(fullscreen!!)
assertFalse(fullscreen!!)
}
@Test
......
components/lib/crash/src/main/res/values-mr/strings.xml
View file @ bac84265
......@@ -20,4 +20,13 @@
<!-- Label of notification showing that the crash report service is running. %1$s will be replaced with the name of the organization (e.g. Mozilla). -->
<string name="mozac_lib_send_crash_report_in_progress">समस्येचा चा अहवाल %1$s ला पाठवत आहे</string>
<!-- Title of the activity that shows the list of past crashes (similar to about:crashes)-->
<string name="mozac_lib_crash_activity_title">क्रॅश अहवाल</string>
<!-- Text shown instead of crash list if no crashes have been submitted yet -->
<string name="mozac_lib_crash_no_crashes">कुठलेही क्रॅश अहवाल दाखल केले गेले नाहीत.</string>
<!-- Text link that will show an app chooser to share a crash report with a third-party app (e.g. gmail) -->
<string name="mozac_lib_crash_share">सामायिक करा</string>
</resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment