PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
create-pull-request/patch-3dc5833
cromite/build/patches/Remove-voice-recognition-integration.patch
T

762 lines
41 KiB
Diff
Raw Permalink Blame History

From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 19 Jun 2022 12:57:56 +0200
Subject: Remove voice recognition integration
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../BaseCustomTabRootUiCoordinator.java | 2 +-
.../chrome/browser/ntp/NewTabPage.java | 30 +----------
.../browser/ntp/search/SearchBoxMediator.java | 1 +
.../browser/searchwidget/SearchActivity.java | 3 +-
.../SearchActivityLocationBarLayout.java | 8 ---
.../tabbed_mode/TabbedRootUiCoordinator.java | 2 +-
.../browser/toolbar/ToolbarManager.java | 5 --
.../ui/AdaptiveToolbarUiCoordinator.java | 50 -------------------
.../chrome/browser/ui/RootUiCoordinator.java | 25 ----------
chrome/browser/ui/android/omnibox/BUILD.gn | 1 -
.../chrome/browser/omnibox/LocationBar.java | 6 ---
.../omnibox/LocationBarCoordinator.java | 14 +-----
.../browser/omnibox/LocationBarLayout.java | 6 ---
.../browser/omnibox/LocationBarMediator.java | 48 +-----------------
.../chrome/browser/omnibox/OmniboxStub.java | 8 ---
.../suggestions/AutocompleteController.java | 25 ----------
.../suggestions/AutocompleteCoordinator.java | 8 ---
.../suggestions/AutocompleteMediator.java | 9 ----
.../omnibox/voice/VoiceRecognitionUtil.java | 1 +
chrome/browser/ui/android/toolbar/BUILD.gn | 1 -
.../toolbar/VoiceToolbarButtonController.java | 1 +
21 files changed, 11 insertions(+), 243 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java
@@ -526,7 +526,7 @@ public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
mIntentDataProvider.get(),
AppCompatResources.getDrawable(mActivity, R.drawable.ic_open_in_new_white_24dp),
mOpenInBrowserRunnable,
- () -> addVoiceSearchAdaptiveButton(trackerSupplier));
+ () -> {});
}
@Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -64,7 +64,6 @@ import org.chromium.chrome.browser.ntp_customization.NtpCustomizationUtils.NtpBa
import org.chromium.chrome.browser.ntp_customization.theme.chrome_colors.NtpThemeColorInfo;
import org.chromium.chrome.browser.ntp_customization.theme.upload_image.BackgroundImageInfo;
import org.chromium.chrome.browser.omnibox.OmniboxStub;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.readaloud.ReadAloudController;
@@ -122,7 +121,6 @@ public class NewTabPage
TemplateUrlServiceObserver,
BrowserControlsStateProvider.Observer,
FeedSurfaceDelegate,
- VoiceRecognitionHandler.Observer,
SnackbarManageable {
private static final String TAG = "NewTabPage";
@@ -157,7 +155,6 @@ public class NewTabPage
protected boolean mIsDefaultSearchEngineGoogle;
protected @Nullable OmniboxStub mOmniboxStub;
- private @Nullable VoiceRecognitionHandler mVoiceRecognitionHandler;
// The timestamp at which the constructor was called.
protected final long mConstructedTimeNs;
@@ -260,8 +257,7 @@ public class NewTabPage
@Override
public boolean isVoiceSearchEnabled() {
- return mVoiceRecognitionHandler != null
- && mVoiceRecognitionHandler.isVoiceSearchEnabled();
+ return false;
}
@Override
@@ -272,15 +268,7 @@ public class NewTabPage
if (mIsDestroyed) return;
FeedReliabilityLogger feedReliabilityLogger =
mFeedSurfaceProvider.getReliabilityLogger();
- if (mVoiceRecognitionHandler != null && beginVoiceSearch) {
- if (feedReliabilityLogger != null) {
- feedReliabilityLogger.onVoiceSearch();
- }
- mVoiceRecognitionHandler.startVoiceRecognition(
- VoiceRecognitionHandler.VoiceInteractionSource.NTP,
- CallbackUtils.emptyRunnable());
- mTracker.notifyEvent(EventConstants.NTP_VOICE_SEARCH_BUTTON_CLICKED);
- } else if (mOmniboxStub != null) {
+ if (mOmniboxStub != null) {
if (feedReliabilityLogger != null) {
feedReliabilityLogger.onOmniboxFocused();
}
@@ -930,12 +918,6 @@ public class NewTabPage
mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger);
}
}
-
- mVoiceRecognitionHandler = mOmniboxStub.getVoiceRecognitionHandler();
- if (mVoiceRecognitionHandler != null) {
- mVoiceRecognitionHandler.addObserver(this);
- mNewTabPageCoordinator.updateActionButtonVisibility();
- }
}
/**
@@ -954,11 +936,6 @@ public class NewTabPage
}
}
- @Override
- public void onVoiceAvailabilityImpacted() {
- mNewTabPageCoordinator.updateActionButtonVisibility();
- }
-
@Override
public SnackbarManager getSnackbarManager() {
return mNewTabPageManager.getSnackbarManager();
@@ -1050,9 +1027,6 @@ public class NewTabPage
mOmniboxStub.removeUrlFocusChangeListener(feedReliabilityLogger);
}
mFeedSurfaceProvider.destroy();
- if (mVoiceRecognitionHandler != null) {
- mVoiceRecognitionHandler.removeObserver(this);
- }
if (mTopInsetChangeObserver != null) {
mTopInsetProvider.removeObserver(mTopInsetChangeObserver);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
@@ -126,6 +126,7 @@ class SearchBoxMediator implements DestroyObserver {
/** Called to add a click listener for the voice search button. */
void addVoiceSearchButtonClickListener(OnClickListener listener) {
+ if ((true)) return;
boolean hasExistingListeners = !mVoiceSearchClickListeners.isEmpty();
mVoiceSearchClickListeners.add(listener);
if (hasExistingListeners) return;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
@@ -72,7 +72,6 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.tab.TabFavicon;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabwindow.TabWindowInfo;
-import org.chromium.chrome.browser.toolbar.VoiceToolbarButtonController;
import org.chromium.chrome.browser.ui.edge_to_edge.NoOpTopInsetProvider;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
@@ -338,7 +337,7 @@ public class SearchActivity extends AsyncInitializationActivity
this::bringTabGroupToFront,
/*omniboxUma*/ (url, transition, isNtp) -> {},
/* bookmarkState= */ (url) -> false,
- VoiceToolbarButtonController::isToolbarMicEnabled,
+ /* isToolbarMicEnabled */ () -> false,
new OmniboxActionDelegateImpl(
this,
() -> mSearchBoxDataProvider.getTab(),
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarCoordinator;
import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.toolbar.top.ToolbarPhone;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.SearchType;
@@ -202,13 +201,6 @@ public class SearchActivityLocationBarLayout extends LocationBarLayout {
return false;
}
- @Override
- public int getVoiceRecognitionSource() {
- return mInteractionFromWidget
- ? VoiceRecognitionHandler.VoiceInteractionSource.SEARCH_WIDGET
- : super.getVoiceRecognitionSource();
- }
-
@Override
public int getLensEntryPoint() {
return mInteractionFromWidget
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -1206,7 +1206,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mTabBookmarkerSupplier,
mBookmarkModelSupplier,
mActivityTabProvider,
- () -> addVoiceSearchAdaptiveButton(trackerSupplier),
+ () -> {},
groupSuggestionsButtonControllerSupplier,
mTabModelSelectorSupplier,
mModalDialogManagerSupplier,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -123,7 +123,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegateImpl;
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
@@ -3434,10 +3433,6 @@ public class ToolbarManager
return mLocationBar.getOmniboxStub();
}
- public @Nullable VoiceRecognitionHandler getVoiceRecognitionHandler() {
- return mLocationBar.getVoiceRecognitionHandler();
- }
-
/** Returns the app menu coordinator. */
public @Nullable MenuButtonCoordinator getOverviewModeMenuButtonCoordinator() {
return mOverviewModeMenuButtonCoordinator;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/AdaptiveToolbarUiCoordinator.java
@@ -32,8 +32,6 @@ import org.chromium.chrome.browser.dom_distiller.ReaderModeIphController;
import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonController;
import org.chromium.chrome.browser.identity_disc.IdentityDiscController;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource;
import org.chromium.chrome.browser.price_history.PriceHistoryBottomSheetContentCoordinator;
import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController;
import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
@@ -46,7 +44,6 @@ import org.chromium.chrome.browser.segmentation_platform.ContextualPageActionCon
import org.chromium.chrome.browser.share.ShareButtonController;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-import org.chromium.chrome.browser.toolbar.VoiceToolbarButtonController;
import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveButtonActionMenuCoordinator;
import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarBehavior;
import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarButtonController;
@@ -84,7 +81,6 @@ public class AdaptiveToolbarUiCoordinator {
private CurrentTabPriceTrackingStateSupplier mCurrentTabPriceTrackingStateSupplier;
private ContextualPageActionController mContextualPageActionController;
private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController;
- private VoiceToolbarButtonController mVoiceToolbarButtonController;
private BottomSheetController mBottomSheetController;
private MonotonicObservableSupplier<Profile> mProfileSupplier;
private Supplier<ScrimManager> mScrimSupplier;
@@ -268,47 +264,6 @@ public class AdaptiveToolbarUiCoordinator {
}
}
- /**
- * Add voice search action button.
- *
- * @param voiceRecognitionHandler Supplies {@link VoiceRecognitionHandler} object.
- * @param trackerSupplier Supplies {@link Tracker} object.
- */
- public void addVoiceSearchAdaptiveButton(
- Supplier<@Nullable VoiceRecognitionHandler> voiceRecognitionHandler,
- Supplier<@Nullable Tracker> trackerSupplier) {
- var voiceSearchDelegate =
- new VoiceToolbarButtonController.VoiceSearchDelegate() {
- @Override
- public boolean isVoiceSearchEnabled() {
- if (voiceRecognitionHandler.get() == null) return false;
- return voiceRecognitionHandler.get().isVoiceSearchEnabled();
- }
-
- @Override
- public void startVoiceRecognition() {
- if (voiceRecognitionHandler.get() == null) return;
- voiceRecognitionHandler
- .get()
- .startVoiceRecognition(
- VoiceInteractionSource.TOOLBAR,
- CallbackUtils.emptyRunnable());
- }
- };
- mVoiceToolbarButtonController =
- new VoiceToolbarButtonController(
- mContext,
- AppCompatResources.getDrawable(mContext, R.drawable.ic_mic_white_24dp),
- mActivityTabProvider,
- trackerSupplier,
- mModalDialogManagerSupplier.get(),
- voiceSearchDelegate);
-
- assert mAdaptiveToolbarButtonController != null;
- mAdaptiveToolbarButtonController.addButtonVariant(
- AdaptiveToolbarButtonVariant.VOICE, mVoiceToolbarButtonController);
- }
-
/**
* Returns the list of {@link ButtonDataProvider}. The order in which the providers determines
* which one will be shown first.
@@ -322,11 +277,6 @@ public class AdaptiveToolbarUiCoordinator {
return mContextualPageActionController;
}
- /** Returns {@link VoiceToolbarButtonController} used for voice search button. */
- public VoiceToolbarButtonController getVoiceToolbarButtonController() {
- return mVoiceToolbarButtonController;
- }
-
/** Invokes Price Insights UI. */
public void runPriceInsightsAction() {
mAdaptiveToolbarButtonController.runPriceInsightsAction();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -130,7 +130,6 @@ import org.chromium.chrome.browser.ntp_customization.edge_to_edge.TopInsetCoordi
import org.chromium.chrome.browser.omnibox.OmniboxChipManager;
import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.open_in_app.OpenInAppEntryPoint;
import org.chromium.chrome.browser.open_in_app.OpenInAppMenuItemProvider;
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
@@ -363,7 +362,6 @@ public class RootUiCoordinator
private @Nullable LayoutManagerImpl mLayoutManager;
protected OneshotSupplier<ToolbarIntentMetadata> mIntentMetadataOneshotSupplier;
protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
- private VoiceRecognitionHandler.@Nullable Observer mMicStateObserver;
private @Nullable MediaCaptureOverlayController mCaptureController;
private @Nullable ScrollCaptureManager mScrollCaptureManager;
protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
@@ -860,9 +858,6 @@ public class RootUiCoordinator
}
if (mToolbarManager != null) {
- if (mMicStateObserver != null && mToolbarManager.getVoiceRecognitionHandler() != null) {
- mToolbarManager.getVoiceRecognitionHandler().removeObserver(mMicStateObserver);
- }
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1966,30 +1961,10 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
-
- var voiceButtonController =
- mAdaptiveToolbarUiCoordinator.getVoiceToolbarButtonController();
- var voiceRecognitionHandler = mToolbarManager.getVoiceRecognitionHandler();
- if (voiceButtonController != null && voiceRecognitionHandler != null) {
- mMicStateObserver = voiceButtonController::updateMicButtonState;
- voiceRecognitionHandler.addObserver(mMicStateObserver);
- }
mToolbarManagerOneshotSupplier.set(mToolbarManager);
}
}
- protected void addVoiceSearchAdaptiveButton(Supplier<@Nullable Tracker> trackerSupplier) {
- if (mAdaptiveToolbarUiCoordinator == null) {
- assert mActivity == null
- : "mAdaptiveToolbarUiCoordinator was null but RootUiCoordinator was not"
- + " destroyed";
- return;
- }
-
- mAdaptiveToolbarUiCoordinator.addVoiceSearchAdaptiveButton(
- () -> mToolbarManager.getVoiceRecognitionHandler(), trackerSupplier);
- }
-
/**
* Constructs a {@link ScrimManager} and sets up observers. Lifetime of all these objects should
* match.
diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
--- a/chrome/browser/ui/android/omnibox/BUILD.gn
+++ b/chrome/browser/ui/android/omnibox/BUILD.gn
@@ -181,7 +181,6 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java",
- "java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java",
]
public_deps = [
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBar.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBar.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBar.java
@@ -11,7 +11,6 @@ import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsVisualState;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.components.browser_ui.accessibility.PageZoomUtils;
@@ -74,11 +73,6 @@ public interface LocationBar {
*/
View getSecurityIconView();
- /** Returns the {@link VoiceRecognitionHandler} associated with this LocationBar. */
- default @Nullable VoiceRecognitionHandler getVoiceRecognitionHandler() {
- return null;
- }
-
/**
* Returns a (@link OmniboxStub}.
*
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -63,7 +63,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdow
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsVisualState;
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.share.ShareDelegate;
@@ -617,12 +616,6 @@ public class LocationBarCoordinator
return mLocationBarLayout.getSecurityIconView();
}
- /** Returns the {@link VoiceRecognitionHandler} associated with this LocationBar. */
- @Override
- public @Nullable VoiceRecognitionHandler getVoiceRecognitionHandler() {
- return mLocationBarMediator.getVoiceRecognitionHandler();
- }
-
@Override
public @Nullable OmniboxStub getOmniboxStub() {
return mLocationBarMediator;
@@ -784,7 +777,7 @@ public class LocationBarCoordinator
public void startAutocompletePrefetch() {
if (!mNativeInitialized) return;
mAutocompleteCoordinator.prefetchZeroSuggestResults(
- mLocationBarMediator.getLocationBarDataProvider().getTab());
+ /* tab */ null);
}
/**
@@ -1042,11 +1035,6 @@ public class LocationBarCoordinator
// End tablet-specific methods.
- public void setVoiceRecognitionHandlerForTesting(
- VoiceRecognitionHandler voiceRecognitionHandler) {
- mLocationBarMediator.setVoiceRecognitionHandlerForTesting(voiceRecognitionHandler);
- }
-
public void onUrlChangedForTesting() {
mLocationBarMediator.onUrlChanged(false);
}
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
import org.chromium.chrome.browser.omnibox.status.StatusView;
import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
import org.chromium.components.browser_ui.widget.CompositeTouchDelegate;
import org.chromium.components.embedder_support.util.UrlUtilities;
@@ -505,11 +504,6 @@ public class LocationBarLayout extends ConstraintLayout {
mSearchEngineUtils = searchEngineUtils;
}
- /** Returns the source of Voice Recognition interactions. */
- public int getVoiceRecognitionSource() {
- return VoiceRecognitionHandler.VoiceInteractionSource.OMNIBOX;
- }
-
/** Returns the entrypoint used to launch Lens. */
public int getLensEntryPoint() {
return LensEntryPoint.OMNIBOX;
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
@@ -78,7 +78,6 @@ import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxLoadUrlParams;
import org.chromium.chrome.browser.omnibox.suggestions.SiteSearchActivationSource;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
import org.chromium.chrome.browser.profiles.Profile;
@@ -132,7 +131,6 @@ import java.util.function.Supplier;
class LocationBarMediator
implements LocationBarDataProvider.Observer,
OmniboxStub,
- VoiceRecognitionHandler.Observer,
UrlBarDelegate,
OnKeyListener,
FuseboxAttachmentChangeListener,
@@ -193,7 +191,6 @@ class LocationBarMediator
};
private final LocationBarLayout mLocationBarLayout;
- private VoiceRecognitionHandler mVoiceRecognitionHandler;
private final LocationBarDataProvider mLocationBarDataProvider;
private final @Nullable BrowserControlsStateProvider mBrowserControlsStateProvider;
private final LocationBarEmbedderUiOverrides mEmbedderUiOverrides;
@@ -372,18 +369,6 @@ class LocationBarMediator
mAutocompleteCoordinator = autocompleteCoordinator;
mStatusCoordinator = statusCoordinator;
- // Set up VoiceRecognitionHandler once mAutocompleteCoordinator is set.
- if (mVoiceRecognitionHandler == null) {
- mVoiceRecognitionHandler =
- new VoiceRecognitionHandler(
- this,
- mLocationBarDataProvider,
- mAutocompleteCoordinator,
- mWindowAndroid,
- mProfileSupplier);
- mVoiceRecognitionHandler.addObserver(this);
- }
-
updateShouldAnimateIconChanges();
updateButtonVisibility();
updateSearchEngineStatusIconShownState();
@@ -403,9 +388,6 @@ class LocationBarMediator
mStatusCoordinator = null;
mAutocompleteCoordinator = null;
mUrlCoordinator = null;
- mVoiceRecognitionHandler.removeObserver(this);
- mVoiceRecognitionHandler.destroy();
- mVoiceRecognitionHandler = null;
mLocationBarDataProvider.removeObserver(this);
mUrlFocusChangeListeners.clear();
if (mPageZoomIndicatorCoordinator != null) {
@@ -534,11 +516,6 @@ class LocationBarMediator
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
}
- /* package */ void setVoiceRecognitionHandlerForTesting(
- VoiceRecognitionHandler voiceRecognitionHandler) {
- mVoiceRecognitionHandler = voiceRecognitionHandler;
- }
-
/* package */ void setLensControllerForTesting(LensController lensController) {
mLensController = lensController;
}
@@ -983,10 +960,6 @@ class LocationBarMediator
// Hide keyboard before launch voice search to avoid keyboard action announcement in
// TalkBack to be picked up by voice search.
mUrlCoordinator.setKeyboardVisibility(false, false);
-
- RecordUserAction.record("MobileOmniboxVoiceSearch");
- mVoiceRecognitionHandler.startVoiceRecognition(
- mLocationBarLayout.getVoiceRecognitionSource(), CallbackUtils.emptyRunnable());
}
/** package */
@@ -1830,10 +1803,7 @@ class LocationBarMediator
if (isUrlBarFocusedOnDesktop()) return false;
- if (!mNativeInitialized
- || mVoiceRecognitionHandler == null
- || !mVoiceRecognitionHandler.isVoiceSearchEnabled()
- || !mEmbedderUiOverrides.isVoiceEntrypointAllowed()) {
+ if ((true)) {
return false;
}
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
@@ -1851,6 +1821,7 @@ class LocationBarMediator
@VisibleForTesting
boolean shouldShowLensButton() {
+ if ((true)) return false;
if (mCurrentInput != null && !mCurrentInput.isConventionalRequestType()) return false;
if (isUrlBarFocusedWithUserInput()) return false;
@@ -2125,11 +2096,6 @@ class LocationBarMediator
mUrlCoordinator.clearFocus();
}
- @Override
- public @Nullable VoiceRecognitionHandler getVoiceRecognitionHandler() {
- return mVoiceRecognitionHandler;
- }
-
@Override
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
mUrlFocusChangeListeners.addObserver(listener);
@@ -2154,20 +2120,10 @@ class LocationBarMediator
.build());
}
- @Override
- public void onVoiceAvailabilityImpacted() {
- updateButtonVisibility();
- }
-
boolean isUrlBarFocusedWithoutAnimation() {
return mUrlFocusedWithoutAnimations;
}
- /** Getter for LocationBarDataProvider. */
- public LocationBarDataProvider getLocationBarDataProvider() {
- return mLocationBarDataProvider;
- }
-
// UrlBarDelegate implementation.
@Override
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/OmniboxStub.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/OmniboxStub.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/OmniboxStub.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/OmniboxStub.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.omnibox;
import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.lens.LensEntryPoint;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.components.omnibox.AutocompleteInput;
import org.chromium.url.GURL;
@@ -35,13 +34,6 @@ public interface OmniboxStub {
*/
boolean isUrlBarFocused();
- /**
- * Get the {@link VoiceRecognitionHandler}.
- *
- * @return the {@link VoiceRecognitionHandler}
- */
- @Nullable VoiceRecognitionHandler getVoiceRecognitionHandler();
-
/**
* Adds a URL focus change listener that will be notified when the URL gains or loses focus.
*
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
@@ -17,7 +17,6 @@ import org.chromium.build.annotations.NullMarked;
import org.chromium.build.annotations.Nullable;
import org.chromium.chrome.browser.omnibox.OmniboxMetrics;
import org.chromium.chrome.browser.omnibox.fusebox.ComposeboxQueryControllerBridge;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult;
import org.chromium.chrome.browser.preloading.PreloadingFeatureMap;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.omnibox.AutocompleteInput;
@@ -360,25 +359,6 @@ public class AutocompleteController {
mNativeController, bridge == null ? 0L : bridge.getNativeInstance());
}
- /**
- * Pass the voice provider a list representing the results of a voice recognition.
- *
- * @param results A list containing the results of a voice recognition.
- */
- void onVoiceResults(@Nullable List<VoiceResult> results) {
- if (mNativeController == 0) return;
- if (results == null || results.size() == 0) return;
- final int count = Math.min(results.size(), MAX_VOICE_SUGGESTION_COUNT);
- String[] voiceMatches = new String[count];
- float[] confidenceScores = new float[count];
- for (int i = 0; i < count; i++) {
- voiceMatches[i] = results.get(i).getMatch();
- confidenceScores[i] = results.get(i).getConfidence();
- }
- AutocompleteControllerJni.get()
- .setVoiceMatches(mNativeController, voiceMatches, confidenceScores);
- }
-
/**
* Updates searchbox stats parameters on the selected match that we will navigate to and
* returns the updated URL.
@@ -498,11 +478,6 @@ public class AutocompleteController {
long nativeAutocompleteControllerAndroid,
long nativeComposeboxQueryControllerBridge);
- void setVoiceMatches(
- long nativeAutocompleteControllerAndroid,
- String[] matches,
- float[] confidenceScores);
-
// Sends a zero suggest request to the server in order to pre-populate the result cache.
void startPrefetch(
long nativeAutocompleteControllerAndroid,
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.SuggestionListViewBinder.
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl;
import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionViewBinder;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
@@ -332,13 +331,6 @@ public class AutocompleteCoordinator implements OmniboxSuggestionsVisualState {
}
}
- /**
- * @see AutocompleteController#onVoiceResults(List)
- */
- public void onVoiceResults(@Nullable List<VoiceRecognitionHandler.VoiceResult> results) {
- mMediator.onVoiceResults(results);
- }
-
/**
* @return The current native pointer to the autocomplete results. TODO(ender): Figure out how
* to remove this.
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
@@ -52,7 +52,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDeleg
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionFactoryImpl;
import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionInSuggest;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.preloading.PreloadingFeatureMap;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -698,14 +697,6 @@ class AutocompleteMediator
mShouldPreventOmniboxAutocomplete = prevent;
}
- /**
- * @see AutocompleteController#onVoiceResults(List)
- */
- void onVoiceResults(@Nullable List<VoiceRecognitionHandler.VoiceResult> results) {
- if (!isInInputSession()) return;
- mAutocomplete.onVoiceResults(results);
- }
-
/**
* TODO(crbug.com/40725530): Figure out how to remove this.
*
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionUtil.java
@@ -118,6 +118,7 @@ public class VoiceRecognitionUtil {
* @return {@code true} if recognition is supported. {@code false} otherwise.
*/
public static boolean isRecognitionIntentPresent(boolean useCachedValue) {
+ if ((true)) return false;
ThreadUtils.assertOnUiThread();
if (sHasRecognitionIntentHandler == null || !useCachedValue) {
sHasRecognitionIntentHandler =
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -39,7 +39,6 @@ android_library("core_java") {
"java/src/org/chromium/chrome/browser/toolbar/ToolbarResourceUtils.java",
"java/src/org/chromium/chrome/browser/toolbar/ToolbarTabController.java",
"java/src/org/chromium/chrome/browser/toolbar/ToolbarTabControllerImpl.java",
- "java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java",
"java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveButtonActionMenuCoordinator.java",
"java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarBehavior.java",
"java/src/org/chromium/chrome/browser/toolbar/adaptive/AdaptiveToolbarBridge.java",
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/VoiceToolbarButtonController.java
@@ -134,6 +134,7 @@ public class VoiceToolbarButtonController extends BaseButtonDataProvider {
/** Returns whether the feature flags allow showing the mic icon in the toolbar. */
public static boolean isToolbarMicEnabled() {
+ if ((true)) return false;
if (!FeatureList.isInitialized()) return false;
return AdaptiveToolbarFeatures.isCustomizationEnabled();
}
--
Reference in New Issue View Git Blame Copy Permalink