From 005ad6ff2ab0c72784bcba6242cc6545918a4d7c Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Fri, 26 Jun 2020 14:16:57 -0400 Subject: [PATCH] Update Android Components version to 48.0.20200626130049. (#12006) Co-authored-by: MickeyMoz Co-authored-by: Gabriel Luong --- .../org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt | 2 +- .../main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt | 3 ++- buildSrc/src/main/java/AndroidComponents.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index bc0e49ae5..427ec0306 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -70,7 +70,7 @@ class DefaultToolbarMenu( onAddonsManagerTapped = { onItemTapped.invoke(ToolbarMenu.Item.AddonsManager) }, - appendExtensionActionAtStart = !shouldReverseItems + appendExtensionSubMenuAtStart = !shouldReverseItems ) } diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt index 9745caa8a..e8ac2a019 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayViewHolder.kt @@ -20,6 +20,7 @@ import mozilla.components.concept.tabstray.TabsTray import mozilla.components.feature.media.ext.pauseIfPlaying import mozilla.components.feature.media.ext.playIfPaused import mozilla.components.support.base.observer.Observable +import mozilla.components.support.images.ImageRequest import mozilla.components.support.images.loader.ImageLoader import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl import org.mozilla.fenix.R @@ -71,7 +72,7 @@ class TabTrayViewHolder( if (tab.thumbnail != null) { thumbnailView.setImageBitmap(tab.thumbnail) } else { - imageLoader.loadIntoView(thumbnailView, tab.id) + imageLoader.loadIntoView(thumbnailView, ImageRequest(tab.id)) } // Media state diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt index 372ee2727..eb09f595f 100644 --- a/buildSrc/src/main/java/AndroidComponents.kt +++ b/buildSrc/src/main/java/AndroidComponents.kt @@ -3,5 +3,5 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ object AndroidComponents { - const val VERSION = "48.0.20200625130125" + const val VERSION = "48.0.20200626130049" }