[Mfill Android] Collapse all sheet methods into single code path

This CL collapses all code-paths for accessory sheets into one.
All sheets now have common classes for coordinator, mediator and model.
For the ViewBinders, this would make no sense (since they are static
classes used to implement interfaces anyway) and Views are largely
shared anyway.
The wiring is only partly hidden in these super classes since it would
be too difficult to find the connection between ViewBinder, Model and
Coordinator if we would just require interfaces [1].

Minor, intentional clean-ups:
 - Credit Cards now have a UserInfo type representation.
 - The address sheet isn't any longer in V2 but instead guarded by the
   same flag as the credit card sheet.

[1] I tried and reverted it. It pretty much takes 300 more lines away
but then, the whole component becomes very in-transparent.

Details to follow.

Bug: 902425
Change-Id: Ia44694f72418b5f27a021569bfb3e70a19f24201
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1634736
Commit-Queue: Friedrich [CET] <fhorschig@chromium.org>
Reviewed-by: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666231}

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -54,17 +54,16 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/AccessorySheetViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_component/NoSwipeViewPager.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabCoordinator.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabMetricsRecorder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabModel.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetCoordinator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetCoordinator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutCoordinator.java",

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponentBridge.java

@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.keyboard_accessory;
 
 import android.graphics.Bitmap;
 import android.support.annotation.Px;
+import android.util.SparseArray;
 
 import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
@@ -21,10 +22,8 @@ import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.WindowAndroid;
 
 class ManualFillingComponentBridge {
-    private final PropertyProvider<AccessorySheetData> mPasswordSheetProvider =
-            new PropertyProvider<>();
-    private final PropertyProvider<AccessorySheetData> mAddressSheetProvider =
-            new PropertyProvider<>();
+    private final SparseArray<PropertyProvider<AccessorySheetData>> mProviders =
+            new SparseArray<>();
     private final PropertyProvider<Action[]> mActionProvider =
             new PropertyProvider<>(AccessoryAction.GENERATE_PASSWORD_AUTOMATIC);
     private final ManualFillingComponent mManualFillingComponent;
@@ -35,12 +34,18 @@ class ManualFillingComponentBridge {
         mNativeView = nativeView;
         mActivity = (ChromeActivity) windowAndroid.getActivity().get();
         mManualFillingComponent = mActivity.getManualFillingComponent();
-        mManualFillingComponent.registerPasswordProvider(mPasswordSheetProvider);
-        mManualFillingComponent.registerAddressProvider(mAddressSheetProvider);
-        mManualFillingComponent.registerCreditCardProvider();
         mManualFillingComponent.registerActionProvider(mActionProvider);
     }
 
+    PropertyProvider<AccessorySheetData> getOrCreateProvider(@AccessoryTabType int tabType) {
+        PropertyProvider<AccessorySheetData> provider = mProviders.get(tabType);
+        if (provider != null) return provider;
+        provider = new PropertyProvider<>();
+        mProviders.put(tabType, provider);
+        mManualFillingComponent.registerSheetDataProvider(tabType, provider);
+        return provider;
+    }
+
     @CalledByNative
     private static ManualFillingComponentBridge create(
             long nativeView, WindowAndroid windowAndroid) {
@@ -50,17 +55,7 @@ class ManualFillingComponentBridge {
     @CalledByNative
     private void onItemsAvailable(Object objAccessorySheetData) {
         AccessorySheetData accessorySheetData = (AccessorySheetData) objAccessorySheetData;
-        switch (accessorySheetData.getSheetType()) {
-            case AccessoryTabType.PASSWORDS:
-                mPasswordSheetProvider.notifyObservers((AccessorySheetData) objAccessorySheetData);
-                return;
-            case AccessoryTabType.CREDIT_CARDS:
-                // TODO(crbug.com/926365): Implement.
-                return;
-            case AccessoryTabType.ADDRESSES:
-                mAddressSheetProvider.notifyObservers((AccessorySheetData) objAccessorySheetData);
-                return;
-        }
+        getOrCreateProvider(accessorySheetData.getSheetType()).notifyObservers(accessorySheetData);
     }
 
     @CalledByNative
@@ -117,8 +112,9 @@ class ManualFillingComponentBridge {
 
     @CalledByNative
     private void destroy() {
-        mPasswordSheetProvider.notifyObservers(null);
-        mAddressSheetProvider.notifyObservers(null);
+        for (int i = 0; i < mProviders.size(); ++i) {
+            mProviders.valueAt(i).notifyObservers(null);
+        }
         mNativeView = 0;
     }
 

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingCoordinator.java

@@ -88,20 +88,9 @@ class ManualFillingCoordinator implements ManualFillingComponent {
     }
 
     @Override
-    public void registerPasswordProvider(
+    public void registerSheetDataProvider(@AccessoryTabType int sheetType,
             PropertyProvider<KeyboardAccessoryData.AccessorySheetData> sheetDataProvider) {
-        mMediator.registerPasswordProvider(sheetDataProvider);
-    }
-
-    @Override
-    public void registerAddressProvider(
-            PropertyProvider<KeyboardAccessoryData.AccessorySheetData> sheetDataProvider) {
-        mMediator.registerAddressProvider(sheetDataProvider);
-    }
-
-    @Override
-    public void registerCreditCardProvider() {
-        mMediator.registerCreditCardProvider();
+        mMediator.registerSheetDataProvider(sheetType, sheetDataProvider);
     }
 
     @Override

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingState.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.keyboard_accessory;
 
 import android.support.annotation.Nullable;
+import android.util.SparseArray;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.keyboard_accessory.data.CachedProviderAdapter;
@@ -12,9 +13,7 @@ import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData
 import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
 import org.chromium.chrome.browser.keyboard_accessory.data.PropertyProvider;
 import org.chromium.chrome.browser.keyboard_accessory.data.Provider;
-import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AddressAccessorySheetCoordinator;
-import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.CreditCardAccessorySheetCoordinator;
-import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.PasswordAccessorySheetCoordinator;
+import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabCoordinator;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 
@@ -25,14 +24,23 @@ import java.util.ArrayList;
  * and its sheet for the {@link WebContents} it is attached to.
  */
 class ManualFillingState {
+    private final static int[] TAB_ORDER = {
+            AccessoryTabType.PASSWORDS, AccessoryTabType.CREDIT_CARDS, AccessoryTabType.ADDRESSES};
     private final WebContents mWebContents;
-    private boolean mWebContentsShowing;
+    private final SparseArray<SheetState> mSheetStates = new SparseArray<>();
     private @Nullable CachedProviderAdapter<KeyboardAccessoryData.Action[]> mActionsProvider;
-    private @Nullable CachedProviderAdapter<AccessorySheetData> mPasswordSheetDataProvider;
-    private @Nullable CachedProviderAdapter<AccessorySheetData> mAddressSheetDataProvider;
-    private @Nullable PasswordAccessorySheetCoordinator mPasswordAccessorySheet;
-    private @Nullable AddressAccessorySheetCoordinator mAddressAccessorySheet;
-    private @Nullable CreditCardAccessorySheetCoordinator mCreditCardAccessorySheet;
+    private boolean mWebContentsShowing;
+
+    private static class SheetState {
+        @Nullable
+        CachedProviderAdapter<AccessorySheetData> mDataProvider;
+        @Nullable
+        AccessorySheetTabCoordinator mSheet;
+
+        void notifyProviderObservers() {
+            if (mDataProvider != null) mDataProvider.notifyAboutCachedItems();
+        }
+    }
 
     private class Observer extends WebContentsObserver {
         public Observer(WebContents webContents) {
@@ -44,8 +52,9 @@ class ManualFillingState {
             super.wasShown();
             mWebContentsShowing = true;
             if (mActionsProvider != null) mActionsProvider.notifyAboutCachedItems();
-            if (mPasswordSheetDataProvider != null)
-                mPasswordSheetDataProvider.notifyAboutCachedItems();
+            for (int state : TAB_ORDER) {
+                getStateFor(state).notifyProviderObservers();
+            }
         }
 
         @Override
@@ -78,27 +87,37 @@ class ManualFillingState {
      */
     void notifyObservers() {
         if (mActionsProvider != null) mActionsProvider.notifyAboutCachedItems();
-        if (mPasswordSheetDataProvider != null) mPasswordSheetDataProvider.notifyAboutCachedItems();
+        for (int state : TAB_ORDER) {
+            // TODO(fhorschig): This needs controller tests for each state in the order!
+            getStateFor(state).notifyProviderObservers();
+        }
     }
 
     KeyboardAccessoryData.Tab[] getTabs() {
         ArrayList<KeyboardAccessoryData.Tab> tabs = new ArrayList<>();
-        if (mPasswordAccessorySheet != null) tabs.add(mPasswordAccessorySheet.getTab());
-        if (mCreditCardAccessorySheet != null) tabs.add(mCreditCardAccessorySheet.getTab());
-        if (mAddressAccessorySheet != null) tabs.add(mAddressAccessorySheet.getTab());
+        for (@AccessoryTabType int type : TAB_ORDER) {
+            SheetState state = getStateFor(type);
+            if (state.mSheet != null) tabs.add(state.mSheet.getTab());
+        }
         return tabs.toArray(new KeyboardAccessoryData.Tab[0]);
     }
 
     void destroy() {
         if (mWebContents != null) mWebContents.removeObserver(mWebContentsObserver);
         mActionsProvider = null;
-        mPasswordSheetDataProvider = null;
-        mPasswordAccessorySheet = null;
-        mCreditCardAccessorySheet = null;
-        mAddressAccessorySheet = null;
+        mSheetStates.clear();
         mWebContentsShowing = false;
     }
 
+    private SheetState getStateFor(@AccessoryTabType int tabType) {
+        SheetState state = mSheetStates.get(tabType);
+        if (state == null) {
+            mSheetStates.put(tabType, new SheetState());
+            state = mSheetStates.get(tabType);
+        }
+        return state;
+    }
+
     /**
      * Wraps the given ActionProvider in a {@link CachedProviderAdapter} and stores it.
      * @param provider A {@link PropertyProvider} providing actions.
@@ -119,64 +138,31 @@ class ManualFillingState {
     }
 
     /**
-     * Wraps the given provider for password data in a {@link CachedProviderAdapter} and stores it.
-     * @param provider A {@link PropertyProvider} providing password sheet data.
+     * Wraps the given provider for sheet data in a {@link CachedProviderAdapter} and stores it.
+     * @param provider A {@link PropertyProvider} providing sheet data.
      */
-    void wrapPasswordSheetDataProvider(PropertyProvider<AccessorySheetData> provider) {
-        mPasswordSheetDataProvider =
+    void wrapSheetDataProvider(
+            @AccessoryTabType int tabType, PropertyProvider<AccessorySheetData> provider) {
+        getStateFor(tabType).mDataProvider =
                 new CachedProviderAdapter<>(provider, null, this::onAdapterReceivedNewData);
     }
 
     /**
-     * Returns the wrapped provider set with {@link #wrapPasswordSheetDataProvider}.
+     * Returns the wrapped provider set with {@link #wrapSheetDataProvider}.
      * @return A {@link CachedProviderAdapter} wrapping a {@link PropertyProvider}.
      */
-    Provider<AccessorySheetData> getPasswordSheetDataProvider() {
-        return mPasswordSheetDataProvider;
-    }
-
-    void setPasswordAccessorySheet(@Nullable PasswordAccessorySheetCoordinator sheet) {
-        mPasswordAccessorySheet = sheet;
-    }
-
-    @Nullable
-    PasswordAccessorySheetCoordinator getPasswordAccessorySheet() {
-        return mPasswordAccessorySheet;
-    }
-
-    /**
-     * Wraps the given provider for address data in a {@link CachedProviderAdapter} and stores it.
-     * @param provider A {@link PropertyProvider} providing password sheet data.
-     */
-    void wrapAddressSheetDataProvider(PropertyProvider<AccessorySheetData> provider) {
-        mAddressSheetDataProvider =
-                new CachedProviderAdapter<>(provider, null, this::onAdapterReceivedNewData);
-    }
-
-    /**
-     * Returns the wrapped provider set with {@link #wrapAddressSheetDataProvider}.
-     * @return A {@link CachedProviderAdapter} wrapping a {@link PropertyProvider}.
-     */
-    Provider<AccessorySheetData> getAddressSheetDataProvider() {
-        return mAddressSheetDataProvider;
-    }
-
-    void setAddressAccessorySheet(@Nullable AddressAccessorySheetCoordinator sheet) {
-        mAddressAccessorySheet = sheet;
-    }
-
-    @Nullable
-    AddressAccessorySheetCoordinator getAddressAccessorySheet() {
-        return mAddressAccessorySheet;
+    Provider<AccessorySheetData> getSheetDataProvider(@AccessoryTabType int tabType) {
+        return getStateFor(tabType).mDataProvider;
     }
 
-    void setCreditCardAccessorySheet(@Nullable CreditCardAccessorySheetCoordinator sheet) {
-        mCreditCardAccessorySheet = sheet;
+    void setAccessorySheet(
+            @AccessoryTabType int tabType, @Nullable AccessorySheetTabCoordinator sheet) {
+        getStateFor(tabType).mSheet = sheet;
     }
 
     @Nullable
-    CreditCardAccessorySheetCoordinator getCreditCardAccessorySheet() {
-        return mCreditCardAccessorySheet;
+    AccessorySheetTabCoordinator getAccessorySheet(@AccessoryTabType int tabType) {
+        return getStateFor(tabType).mSheet;
     }
 
     private void onAdapterReceivedNewData(CachedProviderAdapter adapter) {

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabCoordinator.java

@@ -13,6 +13,8 @@ import android.view.ViewGroup;
 
 import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
 import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData;
+import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
+import org.chromium.chrome.browser.keyboard_accessory.data.Provider;
 
 /**
  * This coordinator aims to be the base class for sheets to be added to the ManualFillingCoordinator
@@ -32,7 +34,7 @@ public abstract class AccessorySheetTabCoordinator implements KeyboardAccessoryD
      * @param tabType The type of this tab as used in histograms.
      * @param scrollListener An optional listener that will be bound to an inflated recycler view.
      */
-    public AccessorySheetTabCoordinator(String title, Drawable icon, String contentDescription,
+    AccessorySheetTabCoordinator(String title, Drawable icon, String contentDescription,
             String openingAnnouncement, @LayoutRes int layout, @AccessoryTabType int tabType,
             @Nullable RecyclerView.OnScrollListener scrollListener) {
         mTab = new KeyboardAccessoryData.Tab(
@@ -46,6 +48,12 @@ public abstract class AccessorySheetTabCoordinator implements KeyboardAccessoryD
         AccessorySheetTabViewBinder.initializeView((RecyclerView) view, mScrollListener);
     }
 
+    @CallSuper
+    @Override
+    public void onTabShown() {
+        getMediator().onTabShown();
+    }
+
     /**
      * Returns the Tab object that describes the appearance of this class in the keyboard accessory
      * or its accessory sheet. The returned object doesn't change for this instance.
@@ -54,4 +62,20 @@ public abstract class AccessorySheetTabCoordinator implements KeyboardAccessoryD
     public KeyboardAccessoryData.Tab getTab() {
         return mTab;
     }
+
+    /**
+     * The mediator that is used to process the data pushed from sources added with
+     * {@link #registerDataProvider(Provider)}.
+     * @return A {@link Provider.Observer<AccessorySheetData>}.
+     */
+    abstract AccessorySheetTabMediator getMediator();
+
+    /**
+     * Registers the provider pushing a complete new instance of {@link AccessorySheetData} that
+     * should be displayed as sheet for this tab.
+     * @param sheetDataProvider A {@link Provider <AccessorySheetData>}.
+     */
+    public void registerDataProvider(Provider<AccessorySheetData> sheetDataProvider) {
+        sheetDataProvider.addObserver(getMediator());
+    }
 }

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetMediator.java → chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabMediator.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.keyboard_accessory.sheet_tabs;
 
+import android.support.annotation.CallSuper;
+
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
 import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
@@ -19,24 +21,30 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class contains all logic for the address accessory sheet component. Changes to its internal
+ * This class contains the logic for the simple accessory sheets. Changes to its internal
  * {@link PropertyModel} are observed by a {@link PropertyModelChangeProcessor} and affect the
- * address accessory sheet tab view.
+ * accessory sheet tab view.
  */
-class AddressAccessorySheetMediator implements Provider.Observer<AccessorySheetData> {
+class AccessorySheetTabMediator implements Provider.Observer<AccessorySheetData> {
     private final AccessorySheetTabModel mModel;
+    private final @AccessoryTabType int mTabType;
+    private final @Type int mUserInfoType;
 
     @Override
     public void onItemAvailable(int typeId, AccessorySheetData accessorySheetData) {
         mModel.set(splitIntoDataPieces(accessorySheetData));
     }
 
-    AddressAccessorySheetMediator(AccessorySheetTabModel model) {
+    AccessorySheetTabMediator(
+            AccessorySheetTabModel model, @AccessoryTabType int tabType, @Type int userInfoType) {
         mModel = model;
+        mTabType = tabType;
+        mUserInfoType = userInfoType;
     }
 
+    @CallSuper
     void onTabShown() {
-        AccessorySheetTabMetricsRecorder.recordSheetSuggestions(AccessoryTabType.ADDRESSES, mModel);
+        AccessorySheetTabMetricsRecorder.recordSheetSuggestions(mTabType, mModel);
     }
 
     private AccessorySheetDataPiece[] splitIntoDataPieces(AccessorySheetData accessorySheetData) {
@@ -47,7 +55,7 @@ class AddressAccessorySheetMediator implements Provider.Observer<AccessorySheetD
             items.add(new AccessorySheetDataPiece(accessorySheetData.getTitle(), Type.TITLE));
         }
         for (UserInfo userInfo : accessorySheetData.getUserInfoList()) {
-            items.add(new AccessorySheetDataPiece(userInfo, Type.ADDRESS_INFO));
+            items.add(new AccessorySheetDataPiece(userInfo, mUserInfoType));
         }
         for (FooterCommand command : accessorySheetData.getFooterCommands()) {
             items.add(new AccessorySheetDataPiece(command, Type.FOOTER_COMMAND));

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AccessorySheetTabModel.java

@@ -39,10 +39,14 @@ class AccessorySheetTabModel extends ListModel<AccessorySheetTabModel.AccessoryS
              * A section containing a users name, address, etc.
              */
             int ADDRESS_INFO = 3;
+            /**
+             * A section containing a payment information.
+             */
+            int CREDIT_CARD_INFO = 4;
             /**
              * A command at the end of the accessory sheet tab.
              */
-            int FOOTER_COMMAND = 4;
+            int FOOTER_COMMAND = 5;
         }
 
         private Object mDataPiece;

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetCoordinator.java

@@ -11,11 +11,12 @@ import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.keyboard_accessory.AccessoryAction;
 import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
+import org.chromium.chrome.browser.keyboard_accessory.ManualFillingMetricsRecorder;
 import org.chromium.chrome.browser.keyboard_accessory.R;
-import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
-import org.chromium.chrome.browser.keyboard_accessory.data.Provider;
 import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece;
+import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece.Type;
 import org.chromium.ui.modelutil.RecyclerViewAdapter;
 import org.chromium.ui.modelutil.SimpleRecyclerViewMcp;
 
@@ -28,6 +29,29 @@ public class AddressAccessorySheetCoordinator extends AccessorySheetTabCoordinat
     private final AddressAccessorySheetMediator mMediator =
             new AddressAccessorySheetMediator(mModel);
 
+    /**
+     * This class contains all logic for the address accessory sheet component. Changes to its
+     * internal
+     * {@link PropertyModel} are observed by a {@link PropertyModelChangeProcessor} and affect the
+     * address accessory sheet tab view.
+     */
+    private static class AddressAccessorySheetMediator extends AccessorySheetTabMediator {
+        AddressAccessorySheetMediator(AccessorySheetTabModel model) {
+            super(model, AccessoryTabType.ADDRESSES, Type.ADDRESS_INFO);
+        }
+
+        @Override
+        void onTabShown() {
+            super.onTabShown();
+
+            // This is a compromise: we log an impression, even if the user didn't scroll down far
+            // enough to see it. If we moved it into the view layer (i.e. when the actual button is
+            // created and shown), we could record multiple impressions of the user scrolls up and
+            // down repeatedly.
+            ManualFillingMetricsRecorder.recordActionImpression(AccessoryAction.MANAGE_ADDRESSES);
+        }
+    }
+
     /**
      * Creates the address tab.
      * @param context The {@link Context} containing resources like icons and layouts for this tab.
@@ -49,17 +73,8 @@ public class AddressAccessorySheetCoordinator extends AccessorySheetTabCoordinat
     }
 
     @Override
-    public void onTabShown() {
-        mMediator.onTabShown();
-    }
-
-    /**
-     * Registers the provider pushing a complete new instance of {@link AccessorySheetData} that
-     * should be displayed as sheet for this tab.
-     * @param accessorySheetDataProvider A {@link Provider <AccessorySheetData>}.
-     */
-    public void registerDataProvider(Provider<AccessorySheetData> accessorySheetDataProvider) {
-        accessorySheetDataProvider.addObserver(mMediator);
+    protected AccessorySheetTabMediator getMediator() {
+        return mMediator;
     }
 
     /**

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetCoordinator.java

@@ -11,12 +11,18 @@ import android.support.v7.widget.RecyclerView;
 
 import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
 import org.chromium.chrome.browser.keyboard_accessory.R;
+import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece.Type;
 
 /**
  * This component is a tab that can be added to the ManualFillingCoordinator. This tab
  * allows selecting credit card information from a sheet below the keyboard accessory.
  */
 public class CreditCardAccessorySheetCoordinator extends AccessorySheetTabCoordinator {
+    private AccessorySheetTabModel mModel = new AccessorySheetTabModel();
+    // TODO(crbug.com/926365): Consider creating a mediator for CCs (e.g. to record footer metrics).
+    private final AccessorySheetTabMediator mMediator = new AccessorySheetTabMediator(
+            mModel, AccessoryTabType.CREDIT_CARDS, Type.CREDIT_CARD_INFO);
+
     /**
      * Creates the credit cards tab.
      * @param context The {@link Context} containing resources like icons and layouts for this tab.
@@ -35,5 +41,7 @@ public class CreditCardAccessorySheetCoordinator extends AccessorySheetTabCoordi
     }
 
     @Override
-    public void onTabShown() {}
+    protected AccessorySheetTabMediator getMediator() {
+        return mMediator;
+    }
 }

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetCoordinator.java

@@ -13,11 +13,12 @@ import android.view.ViewGroup;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.keyboard_accessory.AccessoryAction;
 import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
+import org.chromium.chrome.browser.keyboard_accessory.ManualFillingMetricsRecorder;
 import org.chromium.chrome.browser.keyboard_accessory.R;
-import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
-import org.chromium.chrome.browser.keyboard_accessory.data.Provider;
 import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece;
+import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece.Type;
 import org.chromium.ui.modelutil.ListModel;
 import org.chromium.ui.modelutil.RecyclerViewAdapter;
 import org.chromium.ui.modelutil.SimpleRecyclerViewMcp;
@@ -30,6 +31,29 @@ public class PasswordAccessorySheetCoordinator extends AccessorySheetTabCoordina
     private final AccessorySheetTabModel mModel = new AccessorySheetTabModel();
     private final PasswordAccessorySheetMediator mMediator;
 
+    /**
+     * This class contains all logic for the password accessory sheet component. Changes to its
+     * internal
+     * {@link PropertyModel} are observed by a {@link PropertyModelChangeProcessor} and affect the
+     * password accessory sheet tab view.
+     */
+    private static class PasswordAccessorySheetMediator extends AccessorySheetTabMediator {
+        PasswordAccessorySheetMediator(AccessorySheetTabModel model) {
+            super(model, AccessoryTabType.PASSWORDS, Type.PASSWORD_INFO);
+        }
+
+        @Override
+        void onTabShown() {
+            super.onTabShown();
+
+            // This is a compromise: we log an impression, even if the user didn't scroll down far
+            // enough to see it. If we moved it into the view layer (i.e. when the actual button is
+            // created and shown), we could record multiple impressions of the user scrolls up and
+            // down repeatedly.
+            ManualFillingMetricsRecorder.recordActionImpression(AccessoryAction.MANAGE_PASSWORDS);
+        }
+    }
+
     /**
      * Provides the icon used in this sheet. Simplifies mocking in controller tests.
      */
@@ -86,17 +110,8 @@ public class PasswordAccessorySheetCoordinator extends AccessorySheetTabCoordina
     }
 
     @Override
-    public void onTabShown() {
-        mMediator.onTabShown();
-    }
-
-    /**
-     * Registers the provider pushing a complete new instance of {@link AccessorySheetData} that
-     * should be displayed as sheet for this tab.
-     * @param accessorySheetDataProvider A {@link Provider<AccessorySheetData>}.
-     */
-    public void registerDataProvider(Provider<AccessorySheetData> accessorySheetDataProvider) {
-        accessorySheetDataProvider.addObserver(mMediator);
+    protected AccessorySheetTabMediator getMediator() {
+        return mMediator;
     }
 
     /**

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetMediator.java

-// Copyright 2018 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.chrome.browser.keyboard_accessory.sheet_tabs;
-
-import org.chromium.chrome.browser.ChromeFeatureList;
-import org.chromium.chrome.browser.keyboard_accessory.AccessoryAction;
-import org.chromium.chrome.browser.keyboard_accessory.AccessoryTabType;
-import org.chromium.chrome.browser.keyboard_accessory.ManualFillingMetricsRecorder;
-import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.AccessorySheetData;
-import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.FooterCommand;
-import org.chromium.chrome.browser.keyboard_accessory.data.KeyboardAccessoryData.UserInfo;
-import org.chromium.chrome.browser.keyboard_accessory.data.Provider;
-import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece;
-import org.chromium.chrome.browser.keyboard_accessory.sheet_tabs.AccessorySheetTabModel.AccessorySheetDataPiece.Type;
-import org.chromium.ui.modelutil.PropertyModel;
-import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class contains all logic for the password accessory sheet component. Changes to its internal
- * {@link PropertyModel} are observed by a {@link PropertyModelChangeProcessor} and affect the
- * password accessory sheet tab view.
- */
-class PasswordAccessorySheetMediator implements Provider.Observer<AccessorySheetData> {
-    private final AccessorySheetTabModel mModel;
-
-    @Override
-    public void onItemAvailable(int typeId, AccessorySheetData accessorySheetData) {
-        mModel.set(splitIntoDataPieces(accessorySheetData));
-    }
-
-    PasswordAccessorySheetMediator(AccessorySheetTabModel model) {
-        mModel = model;
-    }
-
-    void onTabShown() {
-        ManualFillingMetricsRecorder.recordActionImpression(AccessoryAction.MANAGE_PASSWORDS);
-        AccessorySheetTabMetricsRecorder.recordSheetSuggestions(AccessoryTabType.PASSWORDS, mModel);
-    }
-
-    private AccessorySheetDataPiece[] splitIntoDataPieces(AccessorySheetData accessorySheetData) {
-        if (accessorySheetData == null) return new AccessorySheetDataPiece[0];
-
-        List<AccessorySheetDataPiece> items = new ArrayList<>();
-        if (shouldShowTitle(accessorySheetData.getUserInfoList())) {
-            items.add(new AccessorySheetDataPiece(accessorySheetData.getTitle(), Type.TITLE));
-        }
-        for (UserInfo userInfo : accessorySheetData.getUserInfoList()) {
-            items.add(new AccessorySheetDataPiece(userInfo, Type.PASSWORD_INFO));
-        }
-        for (FooterCommand command : accessorySheetData.getFooterCommands()) {
-            items.add(new AccessorySheetDataPiece(command, Type.FOOTER_COMMAND));
-        }
-
-        return items.toArray(new AccessorySheetDataPiece[0]);
-    }
-
-    private boolean shouldShowTitle(List<UserInfo> userInfoList) {
-        return !ChromeFeatureList.isEnabled(ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY)
-                || userInfoList.isEmpty();
-    }
-}

chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java

@@ -114,7 +114,8 @@ public class ManualFillingTestHelper {
             final ImeAdapter imeAdapter = ImeAdapter.fromWebContents(mWebContentsRef.get());
             mInputMethodManagerWrapper = TestInputMethodManagerWrapper.create(imeAdapter);
             imeAdapter.setInputMethodManagerWrapper(mInputMethodManagerWrapper);
-            getManualFillingCoordinator().registerPasswordProvider(mSheetSuggestionsProvider);
+            getManualFillingCoordinator().registerSheetDataProvider(
+                    AccessoryTabType.PASSWORDS, mSheetSuggestionsProvider);
         });
         if (waitForNode) DOMUtils.waitForNonZeroNodeBounds(mWebContentsRef.get(), PASSWORD_NODE_ID);
         cacheCredentials(new String[0], new String[0]); // This caches the empty state.
@@ -254,11 +255,15 @@ public class ManualFillingTestHelper {
     }
 
     public PasswordAccessorySheetCoordinator getOrCreatePasswordAccessorySheet() {
-        return getManualFillingCoordinator().getMediatorForTesting().getOrCreatePasswordSheet();
+        return (PasswordAccessorySheetCoordinator) getManualFillingCoordinator()
+                .getMediatorForTesting()
+                .getOrCreateSheet(AccessoryTabType.PASSWORDS);
     }
 
     public AddressAccessorySheetCoordinator getOrCreateAddressAccessorySheet() {
-        return getManualFillingCoordinator().getMediatorForTesting().getOrCreateAddressSheet();
+        return (AddressAccessorySheetCoordinator) getManualFillingCoordinator()
+                .getMediatorForTesting()
+                .getOrCreateSheet(AccessoryTabType.ADDRESSES);
     }
 
     // ----------------------------------

chrome/android/features/keyboard_accessory/javatests/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessoryIntegrationTest.java

@@ -58,7 +58,8 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @RetryOnFailure
-@EnableFeatures({ChromeFeatureList.PASSWORDS_KEYBOARD_ACCESSORY})
+@EnableFeatures({ChromeFeatureList.PASSWORDS_KEYBOARD_ACCESSORY,
+        ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
 public class AddressAccessoryIntegrationTest {
     @Rule
@@ -84,7 +85,7 @@ public class AddressAccessoryIntegrationTest {
 
     @Test
     @SmallTest
-    @EnableFeatures({ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
+    @EnableFeatures({ChromeFeatureList.AUTOFILL_MANUAL_FALLBACK_ANDROID})
     public void testAddressSheetIsAvailable() throws InterruptedException {
         mHelper.loadTestPage(false);
 
@@ -95,7 +96,7 @@ public class AddressAccessoryIntegrationTest {
 
     @Test
     @SmallTest
-    @DisableFeatures({ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
+    @DisableFeatures({ChromeFeatureList.AUTOFILL_MANUAL_FALLBACK_ANDROID})
     public void testAddressSheetUnavailableWithoutFeature() throws InterruptedException {
         mHelper.loadTestPage(false);
 
@@ -105,7 +106,7 @@ public class AddressAccessoryIntegrationTest {
 
     @Test
     @SmallTest
-    @EnableFeatures({ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
+    @EnableFeatures({ChromeFeatureList.AUTOFILL_MANUAL_FALLBACK_ANDROID})
     public void testDisplaysEmptyStateMessageWithoutSavedPasswords()
             throws InterruptedException, TimeoutException {
         mHelper.loadTestPage(false);
@@ -125,7 +126,7 @@ public class AddressAccessoryIntegrationTest {
 
     @Test
     @MediumTest
-    @EnableFeatures({ChromeFeatureList.AUTOFILL_KEYBOARD_ACCESSORY})
+    @EnableFeatures({ChromeFeatureList.AUTOFILL_MANUAL_FALLBACK_ANDROID})
     public void testFillsSuggestionOnClick()
             throws ExecutionException, InterruptedException, TimeoutException {
         loadTestPage(FakeKeyboard::new);

chrome/android/features/keyboard_accessory/public/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java

@@ -53,26 +53,14 @@ public interface ManualFillingComponent {
     void notifyPopupAvailable(DropdownPopupWindow popup);
 
     /**
-     * By registering this provider, an empty tab for passwords is created. Call
+     * By registering a provider, an empty tab of the given tab type is created. Call
      * {@link PropertyProvider#notifyObservers(Object)} to fill or update the sheet.
+     * @param sheetType The type of sheet to instantiate and to provide data for.
      * @param sheetDataProvider The {@link PropertyProvider} the tab will get it's data from.
      */
-    void registerPasswordProvider(
+    void registerSheetDataProvider(@AccessoryTabType int sheetType,
             PropertyProvider<KeyboardAccessoryData.AccessorySheetData> sheetDataProvider);
 
-    /**
-     * By registering this provider, an empty tab for addresses is created. Call
-     * {@link PropertyProvider#notifyObservers(Object)} to fill or update the sheet.
-     * @param sheetDataProvider The {@link PropertyProvider} the tab will get it's data from.
-     */
-    void registerAddressProvider(
-            PropertyProvider<KeyboardAccessoryData.AccessorySheetData> sheetDataProvider);
-
-    /**
-     * By calling this function, an empty tab for credit cards is created.
-     */
-    void registerCreditCardProvider();
-
     /**
      * Registers a provider, to provide actions for the keyboard accessory bar. Call
      * {@link PropertyProvider#notifyObservers(Object)} to fill or update the actions.