From 42bfec38461c044885ab44c5c04d812ef6d61650 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Fri, 25 Jun 2021 15:08:13 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/20029: Remove animations when
 recreating activity on locale change.

---
 .../settings/advanced/DefaultLocaleSettingsController.kt    | 2 ++
 .../fenix/settings/advanced/LocaleSettingsControllerTest.kt | 6 ++++++
 2 files changed, 8 insertions(+)

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
index 8b78c7592b..381cc5d5f9 100644
--- 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
index d55b6f2eaf..a057a5d908 100644
--- 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) }
         }