For mozilla-mobile#20029: Remove animations when recreating activity …

…on locale change.
mcarare · Jun 25, 2021 · 5d062b1 · 5d062b1
1 parent c830ed9
commit 5d062b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt
@@ -31,6 +31,7 @@ class DefaultLocaleSettingsController(
         LocaleManager.setNewLocale(activity, localeUseCase, locale)
         LocaleManager.updateBaseConfiguration(activity, locale)
         activity.recreate()
+        activity.overridePendingTransition(0, 0)
     }
 
     override fun handleDefaultLocaleSelected() {
@@ -41,6 +42,7 @@ class DefaultLocaleSettingsController(
         LocaleManager.resetToSystemDefault(activity, localeUseCase)
         LocaleManager.updateBaseConfiguration(activity, localeSettingsStore.state.localeList[0])
         activity.recreate()
+        activity.overridePendingTransition(0, 0)
     }
 
     override fun handleSearchQueryTyped(query: String) {

diff --git a/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleSettingsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleSettingsControllerTest.kt
@@ -79,6 +79,8 @@ class LocaleSettingsControllerTest {
         verify { localeSettingsStore.dispatch(LocaleSettingsAction.Select(selectedLocale)) }
         verify { LocaleManager.setNewLocale(activity, localeUseCases, selectedLocale) }
         verify { activity.recreate() }
+        verify { activity.overridePendingTransition(0, 0) }
+
         with(controller) {
             verify { LocaleManager.updateBaseConfiguration(activity, selectedLocale) }
         }
@@ -101,6 +103,8 @@ class LocaleSettingsControllerTest {
         verify { localeSettingsStore.dispatch(LocaleSettingsAction.Select(selectedLocale)) }
         verify { LocaleManager.setNewLocale(activity, localeUseCases, selectedLocale) }
         verify { activity.recreate() }
+        verify { activity.overridePendingTransition(0, 0) }
+
         with(controller) {
             verify { LocaleManager.updateBaseConfiguration(activity, selectedLocale) }
         }
@@ -139,6 +143,8 @@ class LocaleSettingsControllerTest {
         verify { localeSettingsStore.dispatch(LocaleSettingsAction.Select(selectedLocale)) }
         verify { LocaleManager.resetToSystemDefault(activity, localeUseCases) }
         verify { activity.recreate() }
+        verify { activity.overridePendingTransition(0, 0) }
+
         with(controller) {
             verify { LocaleManager.updateBaseConfiguration(activity, selectedLocale) }
         }