Bug 1928334 - Handles animating activities a=dmeehan (6edc4c91) · Commits · Dan Ballard / Mullvad Browser

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -798,7 +798,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
		return false
		}

		final override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
		override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
		ProfilerMarkers.addForDispatchTouchEvent(components.core.engine.profiler, ev)
		return super.dispatchTouchEvent(ev)
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ package org.mozilla.fenix.customtabs
		import android.app.assist.AssistContent
		import android.net.Uri
		import android.os.Build
		import android.view.MotionEvent
		import androidx.annotation.RequiresApi
		import androidx.annotation.VisibleForTesting
		import mozilla.components.browser.state.selector.findCustomTab
		@@ -24,6 +25,8 @@ const val EXTRA_IS_SANDBOX_CUSTOM_TAB = "org.mozilla.fenix.customtabs.EXTRA_IS_S
		*/
		@Suppress("TooManyFunctions")
		open class ExternalAppBrowserActivity : HomeActivity() {
		var isFinishedAnimating = false

		override fun onResume() {
		super.onResume()

		@@ -74,4 +77,17 @@ open class ExternalAppBrowserActivity : HomeActivity() {
		val currentTabUrl = getExternalTab()?.content?.url
		outContent?.webUri = currentTabUrl?.let { Uri.parse(it) }
		}

		override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
		if (!isFinishedAnimating) {
		return true
		}

		return super.dispatchTouchEvent(ev)
		}

		override fun onEnterAnimationComplete() {
		super.onEnterAnimationComplete()
		isFinishedAnimating = true
		}
		}