Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] Minor code adjustments to the C127 upstream changes

Browse Source
This commit is contained in:
Artem Samoilenko
2024-06-25 13:13:11 +01:00
committed by Claudio DeSouza
parent 8d9d5238a1
commit 882a482c62
6 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/helpers/ImageLoader.java
+36 -12
View File
@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.app.helpers;
import static org.chromium.chrome.browser.content.WebContentsFactory.DEFAULT_NETWORK_HANDLE;
import static org.chromium.ui.base.ViewUtils.dpToPx;
import android.content.Context;
@@ -114,8 +115,10 @@ public class ImageLoader {
WebContentsFactory webContentsFactory = new WebContentsFactory();
WebContents webContents =
webContentsFactory.createWebContentsWithWarmRenderer(profile, true);
webContents.downloadImage(new GURL(validUrl), // Url
webContentsFactory.createWebContentsWithWarmRenderer(
profile, true, DEFAULT_NETWORK_HANDLE);
webContents.downloadImage(
new GURL(validUrl), // Url
false, // isFavIcon
WalletConstants.MAX_BITMAP_SIZE_FOR_DOWNLOAD, // maxBitmapSize
false, // bypassCache
@@ -141,28 +144,49 @@ public class ImageLoader {
new BitmapDrawable(resources, bestBitmap);
imageFetcherFacade = new ImageFetcherFacade(bitmapDrawable);
}
loadImage(imageFetcherFacade, requestManager, isCircular, roundedCorners,
imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
} else {
ImageFetcher imageFetcher = ImageFetcherFactory.createImageFetcher(
ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
ImageFetcher imageFetcher =
ImageFetcherFactory.createImageFetcher(
ImageFetcherConfig.NETWORK_ONLY, profile.getProfileKey());
if (isGif(url)) {
imageFetcher.fetchGif(
Params.create(new GURL(url), UNUSED_CLIENT_NAME), gifImage -> {
Params.create(new GURL(url), UNUSED_CLIENT_NAME),
gifImage -> {
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(gifImage.getData());
loadImage(imageFetcherFacade, requestManager, isCircular,
roundedCorners, imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
} else {
imageFetcher.fetchImage(
Params.create(new GURL(url), UNUSED_CLIENT_NAME), bitmap -> {
Params.create(new GURL(url), UNUSED_CLIENT_NAME),
bitmap -> {
BitmapDrawable bitmapDrawable = new BitmapDrawable(resources, bitmap);
ImageFetcherFacade imageFetcherFacade =
new ImageFetcherFacade(bitmapDrawable);
loadImage(imageFetcherFacade, requestManager, isCircular,
roundedCorners, imageView, customTarget, callback);
loadImage(
imageFetcherFacade,
requestManager,
isCircular,
roundedCorners,
imageView,
customTarget,
callback);
});
}
}
android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java
+7 -3
View File
@@ -15,6 +15,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListT
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
import org.chromium.ui.modaldialog.ModalDialogManager;
import java.util.function.BooleanSupplier;
class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
// Overridden Chromium's BookmarkToolbarCoordinator.mToolbar
private BookmarkToolbar mToolbar;
@@ -22,7 +24,7 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
BraveBookmarkToolbarCoordinator(
Context context,
SelectableListLayout<BookmarkId> selectableListLayout,
SelectionDelegate selectionDelegate,
SelectionDelegate<BookmarkId> selectionDelegate,
SearchDelegate searchDelegate,
DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
boolean isDialogUi,
@@ -32,7 +34,8 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
BookmarkUiPrefs bookmarkUiPrefs,
ModalDialogManager modalDialogManager,
Runnable endSearchRunnable,
BookmarkMoveSnackbarManager bookmarkMoveSnackbarManager) {
BookmarkMoveSnackbarManager bookmarkMoveSnackbarManager,
BooleanSupplier incognitoEnabledSupplier) {
super(
context,
selectableListLayout,
@@ -46,7 +49,8 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
bookmarkUiPrefs,
modalDialogManager,
endSearchRunnable,
bookmarkMoveSnackbarManager);
bookmarkMoveSnackbarManager,
incognitoEnabledSupplier);
if (mToolbar instanceof BraveBookmarkToolbar) {
((BraveBookmarkToolbar) mToolbar).setBraveBookmarkDelegate(bookmarkDelegateSupplier);
android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java
+1 -3
View File
@@ -81,9 +81,8 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator {
merchantTrustSignalsCoordinatorSupplier,
@NonNull OmniboxActionDelegate omniboxActionDelegate,
BrowserStateBrowserControlsVisibilityDelegate browserControlsVisibilityDelegate,
Callback<Throwable> reportExceptionCallback,
@Nullable BackPressManager backPressManager,
@NonNull
@Nullable
OmniboxSuggestionsDropdownScrollListener
omniboxSuggestionsDropdownScrollListener,
@Nullable ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@@ -115,7 +114,6 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator {
merchantTrustSignalsCoordinatorSupplier,
omniboxActionDelegate,
browserControlsVisibilityDelegate,
reportExceptionCallback,
backPressManager,
omniboxSuggestionsDropdownScrollListener,
tabModelSelectorSupplier,
android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java
+7 -2
View File
@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.BraveConfig;
import org.chromium.chrome.browser.brave_leo.BraveLeoPrefUtils;
import org.chromium.chrome.browser.brave_leo.BraveLeoUtils;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.omnibox.DeferredIMEWindowInsetApplicationCallback;
import org.chromium.chrome.browser.omnibox.LocationBarDataProvider;
import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
@@ -71,7 +72,10 @@ class BraveAutocompleteMediator extends AutocompleteMediator
@NonNull OmniboxActionDelegate omniboxActionDelegate,
@NonNull ActivityLifecycleDispatcher lifecycleDispatcher,
@NonNull OmniboxSuggestionsDropdownEmbedder embedder,
WindowAndroid windowAndroid) {
@NonNull WindowAndroid windowAndroid,
@NonNull
DeferredIMEWindowInsetApplicationCallback
deferredIMEWindowInsetApplicationCallback) {
super(
context,
delegate,
@@ -88,7 +92,8 @@ class BraveAutocompleteMediator extends AutocompleteMediator
omniboxActionDelegate,
lifecycleDispatcher,
embedder,
windowAndroid);
windowAndroid,
deferredIMEWindowInsetApplicationCallback);
mContext = context;
mDelegate = delegate;
android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java
+3 -3
View File
@@ -48,8 +48,8 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
import org.chromium.chrome.features.start_surface.StartSurface;
import org.chromium.components.browser_ui.widget.InsetObserver;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import org.chromium.ui.InsetObserver;
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.modaldialog.ModalDialogManager;
@@ -102,7 +102,7 @@ public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator {
ObservableSupplierImpl<EphemeralTabCoordinator> ephemeralTabCoordinatorSupplier,
@NonNull IntentRequestTracker intentRequestTracker,
int controlContainerHeightResource,
@NonNull Supplier<InsetObserver> insetObserverViewSupplier,
@NonNull InsetObserver insetObserver,
@NonNull Function<Tab, Boolean> backButtonShouldCloseTabFn,
OneshotSupplier<TabReparentingController> tabReparentingControllerSupplier,
boolean initializeUiWithIncognitoColors,
@@ -152,7 +152,7 @@ public class BraveTabbedRootUiCoordinator extends TabbedRootUiCoordinator {
ephemeralTabCoordinatorSupplier,
intentRequestTracker,
controlContainerHeightResource,
insetObserverViewSupplier,
insetObserver,
backButtonShouldCloseTabFn,
tabReparentingControllerSupplier,
initializeUiWithIncognitoColors,
android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+5 -2
View File
@@ -76,6 +76,7 @@ import org.chromium.chrome.browser.new_tab_url.DseNewTabUrlManager;
import org.chromium.chrome.browser.ntp.NewTabPageUma;
import org.chromium.chrome.browser.omnibox.BackKeyBehaviorDelegate;
import org.chromium.chrome.browser.omnibox.BraveLocationBarMediator;
import org.chromium.chrome.browser.omnibox.DeferredIMEWindowInsetApplicationCallback;
import org.chromium.chrome.browser.omnibox.LocationBarDataProvider;
import org.chromium.chrome.browser.omnibox.LocationBarEmbedderUiOverrides;
import org.chromium.chrome.browser.omnibox.LocationBarLayout;
@@ -1275,7 +1276,8 @@ public class BytecodeTest {
OmniboxActionDelegate.class,
ActivityLifecycleDispatcher.class,
OmniboxSuggestionsDropdownEmbedder.class,
WindowAndroid.class));
WindowAndroid.class,
DeferredIMEWindowInsetApplicationCallback.class));
Assert.assertTrue(
constructorsMatch(
"org/chromium/chrome/browser/multiwindow/MultiInstanceManagerApi31",
@@ -1530,7 +1532,8 @@ public class BytecodeTest {
BookmarkUiPrefs.class,
ModalDialogManager.class,
Runnable.class,
BookmarkMoveSnackbarManager.class));
BookmarkMoveSnackbarManager.class,
BooleanSupplier.class));
Assert.assertTrue(
constructorsMatch(
"org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator",