diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/components/CompositorButton.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/components/CompositorButton.java index 24f4d2c4fb431..baa8a9df81806 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/components/CompositorButton.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/components/CompositorButton.java @@ -13,7 +13,7 @@ import androidx.annotation.Nullable; import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutView; import org.chromium.chrome.browser.compositor.overlays.strip.TooltipManager; -import org.chromium.ui.MotionEventUtils; +import org.chromium.ui.util.MotionEventUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java index 60e1520ae225d..a6929c00a955a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java @@ -118,11 +118,11 @@ import org.chromium.components.tab_group_sync.SavedTabGroup; import org.chromium.components.tab_group_sync.TabGroupSyncService; import org.chromium.components.tab_group_sync.TriggerSource; import org.chromium.components.tab_groups.TabGroupColorId; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.util.ColorUtils; +import org.chromium.ui.util.MotionEventUtils; import org.chromium.ui.widget.RectProvider; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java index 903532cc90c53..3e9c1eee93c23 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutTab.java @@ -32,9 +32,9 @@ import org.chromium.chrome.browser.layouts.components.VirtualView; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tasks.tab_management.TabUiThemeUtil; import org.chromium.components.browser_ui.styles.SemanticColorUtils; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.util.ColorUtils; +import org.chromium.ui.util.MotionEventUtils; import java.util.List; import java.util.Optional; diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java index 22fe4884e7330..098c28f2a58f5 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java @@ -41,9 +41,9 @@ import org.chromium.chrome.browser.util.KeyNavigationUtil; import org.chromium.components.browser_ui.widget.RoundedCornerOutlineProvider; import org.chromium.components.omnibox.OmniboxFeatures; import org.chromium.ui.KeyboardVisibilityDelegate; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.util.MotionEventUtils; import java.util.Optional; diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java index 2210030c3369e..3a0bd69e29c98 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java @@ -62,8 +62,8 @@ import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.browser.util.BrowserUiUtils; import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp; import org.chromium.components.feature_engagement.Tracker; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.ViewUtils; +import org.chromium.ui.util.MotionEventUtils; import org.chromium.ui.util.TokenHolder; import org.chromium.url.GURL; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentUiEventHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentUiEventHandler.java index 955daad95d576..9f7fe270329db 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentUiEventHandler.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentUiEventHandler.java @@ -25,12 +25,11 @@ import org.chromium.content.browser.webcontents.WebContentsImpl; import org.chromium.content_public.browser.ViewEventSink.InternalAccessDelegate; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents.UserDataFactory; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.EventForwarder; +import org.chromium.ui.util.MotionEventUtils; /** - * Called from native to handle UI events that need access to various Java layer - * content components. + * Called from native to handle UI events that need access to various Java layer content components. */ @JNINamespace("content") @NullMarked diff --git a/content/public/android/junit/src/org/chromium/content/browser/ContentUiEventHandlerTest.java b/content/public/android/junit/src/org/chromium/content/browser/ContentUiEventHandlerTest.java index 43fbf77e2ffbc..832d8dbbc7d97 100644 --- a/content/public/android/junit/src/org/chromium/content/browser/ContentUiEventHandlerTest.java +++ b/content/public/android/junit/src/org/chromium/content/browser/ContentUiEventHandlerTest.java @@ -26,8 +26,8 @@ import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.content.browser.webcontents.WebContentsImpl; import org.chromium.content.browser.webcontents.WebContentsImplJni; import org.chromium.content_public.browser.NavigationController; -import org.chromium.ui.MotionEventUtils; import org.chromium.ui.base.EventForwarder; +import org.chromium.ui.util.MotionEventUtils; /** Unit tests for {@link ContentUiEventHandler} */ @RunWith(BaseRobolectricTestRunner.class) diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn index 252a5d92e25c3..80c4ca63882d5 100644 --- a/ui/android/BUILD.gn +++ b/ui/android/BUILD.gn @@ -311,7 +311,6 @@ android_library("ui_utils_java") { sources = [ "java/src/org/chromium/ui/KeyboardUtils.java", "java/src/org/chromium/ui/KeyboardVisibilityDelegate.java", - "java/src/org/chromium/ui/MotionEventUtils.java", "java/src/org/chromium/ui/UiUtils.java", ] deps = [ @@ -488,6 +487,7 @@ android_library("ui_no_recycler_view_java") { "java/src/org/chromium/ui/util/AttrUtils.java", "java/src/org/chromium/ui/util/ColorBlendAnimationFactory.java", "java/src/org/chromium/ui/util/ColorUtils.java", + "java/src/org/chromium/ui/util/MotionEventUtils.java", "java/src/org/chromium/ui/util/RunnableTimer.java", "java/src/org/chromium/ui/util/StyleUtils.java", "java/src/org/chromium/ui/util/TokenHolder.java", diff --git a/ui/android/java/src/org/chromium/ui/base/EventForwarder.java b/ui/android/java/src/org/chromium/ui/base/EventForwarder.java index f10e9e91f1516..a9f65f8dd4e38 100644 --- a/ui/android/java/src/org/chromium/ui/base/EventForwarder.java +++ b/ui/android/java/src/org/chromium/ui/base/EventForwarder.java @@ -27,7 +27,7 @@ import org.chromium.base.TraceEvent; import org.chromium.base.metrics.RecordHistogram; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; -import org.chromium.ui.MotionEventUtils; +import org.chromium.ui.util.MotionEventUtils; import java.lang.reflect.UndeclaredThrowableException; import java.util.ArrayList; diff --git a/ui/android/java/src/org/chromium/ui/MotionEventUtils.java b/ui/android/java/src/org/chromium/ui/util/MotionEventUtils.java similarity index 98% rename from ui/android/java/src/org/chromium/ui/MotionEventUtils.java rename to ui/android/java/src/org/chromium/ui/util/MotionEventUtils.java index 4d68f587a8b26..a49df888a97de 100644 --- a/ui/android/java/src/org/chromium/ui/MotionEventUtils.java +++ b/ui/android/java/src/org/chromium/ui/util/MotionEventUtils.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.ui; +package org.chromium.ui.util; import android.os.Build; import android.view.InputDevice; @@ -140,6 +140,7 @@ public class MotionEventUtils { return (buttons & MotionEvent.BUTTON_TERTIARY) != 0; } + /** Checks if the motion event was generated by a secondary button (middle mouse button). */ public static boolean isSecondaryClick(int buttons) { return (buttons & MotionEvent.BUTTON_SECONDARY) != 0; } diff --git a/ui/android/java/src/org/chromium/ui/util/OWNERS b/ui/android/java/src/org/chromium/ui/util/OWNERS index 79e1827ae4ff7..b0456f49b6e29 100644 --- a/ui/android/java/src/org/chromium/ui/util/OWNERS +++ b/ui/android/java/src/org/chromium/ui/util/OWNERS @@ -1 +1,3 @@ per-file XrUtils.java=file://components/webxr/OWNERS +per-file MotionEventUtils.java=skavuluru@google.com +per-file MotionEventUtils.java=aishwaryarj@google.com diff --git a/ui/android/junit/src/org/chromium/ui/base/EventForwarderTest.java b/ui/android/junit/src/org/chromium/ui/base/EventForwarderTest.java index 278b65f5675a8..1c3bff50aa42e 100644 --- a/ui/android/junit/src/org/chromium/ui/base/EventForwarderTest.java +++ b/ui/android/junit/src/org/chromium/ui/base/EventForwarderTest.java @@ -35,7 +35,7 @@ import org.robolectric.annotation.Config; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.HistogramWatcher; -import org.chromium.ui.MotionEventUtils; +import org.chromium.ui.util.MotionEventUtils; /** Tests logic in the {@link EventForwarder} class. */ @RunWith(BaseRobolectricTestRunner.class)