blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1973 - Toggle QR button on deny permissions, fix engineView crashes

master
Emily Kager 2019-05-30 15:35:05 -07:00 committed by Jeff Boek
parent 72c5cb304c
commit 43a961fe73
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -167,7 +167,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
}
}
view.engineView.asView().apply {
view.swipeRefresh.apply {
val toolbarSize =
(resources.displayMetrics.density * TOOLBAR_HEIGHT).toInt() +
(if (customTabSessionId == null) QUICK_ACTION_SHEET_HANDLE_HEIGHT else 0)
@ -692,7 +692,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
ToolbarMenu.Item.SaveToCollection -> showSaveToCollection()
ToolbarMenu.Item.OpenInFenix -> {
// To not get a "Display Already Acquired" error we need to force remove the engineView here
browserLayout?.removeView(engineView as View)
swipeRefresh?.removeView(engineView as View)
val intent = Intent(context, IntentReceiverActivity::class.java)
intent.action = Intent.ACTION_VIEW
getSessionById()?.customTabConfig = null

2
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -311,6 +311,8 @@ class SearchFragment : Fragment(), BackHandler {
context?.let { context: Context ->
if (context.isPermissionGranted(Manifest.permission.CAMERA)) {
permissionDidUpdate = true
} else {
view?.search_scan_button?.isChecked = false
}
}
}