[AA WebLayer] Add empty BrowserControls implementation
We are in the process of launching Autofill Assistant on WebLayer.
Bug: b/222671580
Change-Id: I3a47ccdc03cd90a1b3b768015a0d3ce984b7e150
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3640951
Commit-Queue: Florian Gauger <fga@google.com>
Auto-Submit: Florian Gauger <fga@google.com>
Reviewed-by: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1002140}
diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java
index aeb83e4..f22a7d5 100644
--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java
+++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java
@@ -58,14 +58,12 @@
@Override
public void onControlsOffsetChanged(int topOffset, int topControlsMinHeightOffset,
int bottomOffset, int bottomControlsMinHeightOffset, boolean needsAnimate) {
- mDelegateObserver.onControlsOffsetChanged(topOffset, topControlsMinHeightOffset,
- bottomOffset, bottomControlsMinHeightOffset, needsAnimate);
+ mDelegateObserver.onControlsOffsetChanged();
}
@Override
public void onBottomControlsHeightChanged(
int bottomControlsHeight, int bottomControlsMinHeight) {
- mDelegateObserver.onBottomControlsHeightChanged(
- bottomControlsHeight, bottomControlsMinHeight);
+ mDelegateObserver.onBottomControlsHeightChanged();
}
}
diff --git a/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/AssistantRootViewContainer.java b/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/AssistantRootViewContainer.java
index 1651d8ac..3c2456d 100644
--- a/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/AssistantRootViewContainer.java
+++ b/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/AssistantRootViewContainer.java
@@ -51,14 +51,12 @@
}
@Override
- public void onControlsOffsetChanged(int topOffset, int topControlsMinHeightOffset,
- int bottomOffset, int bottomControlsMinHeightOffset, boolean needsAnimate) {
+ public void onControlsOffsetChanged() {
invalidate();
}
@Override
- public void onBottomControlsHeightChanged(
- int bottomControlsHeight, int bottomControlsMinHeight) {
+ public void onBottomControlsHeightChanged() {
invalidate();
}
diff --git a/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/overlay/AssistantOverlayDrawable.java b/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/overlay/AssistantOverlayDrawable.java
index 3cbc7c91..ac00366 100644
--- a/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/overlay/AssistantOverlayDrawable.java
+++ b/components/autofill_assistant/android/java/src/org/chromium/components/autofill_assistant/overlay/AssistantOverlayDrawable.java
@@ -377,14 +377,12 @@
}
@Override
- public void onControlsOffsetChanged(int topOffset, int topControlsMinHeightOffset,
- int bottomOffset, int bottomControlsMinHeightOffset, boolean needsAnimate) {
+ public void onControlsOffsetChanged() {
invalidateSelf();
}
@Override
- public void onBottomControlsHeightChanged(
- int bottomControlsHeight, int bottomControlsMinHeight) {
+ public void onBottomControlsHeightChanged() {
invalidateSelf();
}
diff --git a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantBrowserControls.java b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantBrowserControls.java
index 2066cf4..ca8cb04 100644
--- a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantBrowserControls.java
+++ b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantBrowserControls.java
@@ -15,9 +15,8 @@
* Observer for different browser control events.
*/
public interface Observer {
- void onControlsOffsetChanged(int topOffset, int topControlsMinHeightOffset,
- int bottomOffset, int bottomControlsMinHeightOffset, boolean needsAnimate);
- void onBottomControlsHeightChanged(int bottomControlsHeight, int bottomControlsMinHeight);
+ void onControlsOffsetChanged();
+ void onBottomControlsHeightChanged();
}
void setObserver(Observer browserControlsObserver);
diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn
index 44883be..0964bcb 100644
--- a/weblayer/browser/java/BUILD.gn
+++ b/weblayer/browser/java/BUILD.gn
@@ -183,6 +183,7 @@
"org/chromium/weblayer_private/WebMessageReplyProxyImpl.java",
"org/chromium/weblayer_private/WebShareServiceFactory.java",
"org/chromium/weblayer_private/WebappsHelper.java",
+ "org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantBrowserControls.java",
"org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantDependencies.java",
"org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantStaticDependencies.java",
"org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantTabChangeObserver.java",
diff --git a/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantBrowserControls.java b/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantBrowserControls.java
new file mode 100644
index 0000000..37e4f18
--- /dev/null
+++ b/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantBrowserControls.java
@@ -0,0 +1,55 @@
+
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.weblayer_private.autofill_assistant;
+
+import org.chromium.components.autofill_assistant.AssistantBrowserControls;
+
+/**
+ * Implementation of {@link AssistantBrowserControls} for WebLayer.
+ */
+public class WebLayerAssistantBrowserControls implements AssistantBrowserControls {
+ private AssistantBrowserControls.Observer mObserver;
+
+ @Override
+ public int getBottomControlsHeight() {
+ // TODO(b/222671580): Implement
+ return 0;
+ }
+
+ @Override
+ public int getBottomControlOffset() {
+ // TODO(b/222671580): Implement
+ return 0;
+ }
+
+ @Override
+ public int getContentOffset() {
+ // TODO(b/222671580): Implement
+ return 0;
+ }
+
+ @Override
+ public float getTopVisibleContentOffset() {
+ // TODO(b/222671580): Implement
+ return 0;
+ }
+
+ @Override
+ public void setObserver(AssistantBrowserControls.Observer browserControlsObserver) {
+ mObserver = browserControlsObserver;
+ }
+
+ @Override
+ public void destroy() {}
+
+ public void onControlsOffsetChanged() {
+ mObserver.onControlsOffsetChanged();
+ }
+
+ public void onBottomControlsHeightChanged() {
+ mObserver.onBottomControlsHeightChanged();
+ }
+}
diff --git a/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantDependencies.java b/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantDependencies.java
index 7f46e51..22786c01 100644
--- a/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantDependencies.java
+++ b/weblayer/browser/java/org/chromium/weblayer_private/autofill_assistant/WebLayerAssistantDependencies.java
@@ -104,8 +104,7 @@
@Override
public AssistantBrowserControlsFactory createBrowserControlsFactory() {
- // TODO(b/222671580): Implement
- return null;
+ return () -> new WebLayerAssistantBrowserControls();
}
@Override
