[iOS][MF] Present the icons to the right on iPad

Shows the manual fallback icons to the right on iPads. Changes include:
-Updates FormInputAccessoryView to support a custom view to the right.
-Stops instantiation of ManualFillAccessoryViewController when manual
fallback is disabled.

Bug: 845472
Change-Id: I82b3772bf60af33f3102b520ce3cc647b16310b9
Reviewed-on: https://chromium-review.googlesource.com/c/1329176
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607655}

ios/chrome/browser/autofill/form_input_accessory_view.h

@@ -10,18 +10,19 @@
 @protocol FormInputAccessoryViewDelegate;
 
 // Subview of the accessory view for web forms. Shows a custom view with form
-// navigation controls above the keyboard. Subclassed to enable input clicks by
-// way of the playInputClick method.
+// navigation controls above the keyboard. Enables input clicks by way of the
+// playInputClick method.
 @interface FormInputAccessoryView : UIView<UIInputViewAudioFeedback>
 
-// Sets up the view with the given |customView|. Navigation controls are shown
-// and use |delegate| for actions.
-- (void)setUpWithNavigationDelegate:(id<FormInputAccessoryViewDelegate>)delegate
-                         customView:(UIView*)customView;
+// Sets up the view with the given |leadingView|. Navigation controls are shown
+// on the trailing side and use |delegate| for actions.
+- (void)setUpWithLeadingView:(UIView*)leadingView
+          navigationDelegate:(id<FormInputAccessoryViewDelegate>)delegate;
 
-// Sets up the view with the given |customView|. Navigation controls are not
-// shown.
-- (void)setUpWithCustomView:(UIView*)customView;
+// Sets up the view with the given |leadingView|. Navigation controls are
+// replaced with |customTrailingView|.
+- (void)setUpWithLeadingView:(UIView*)leadingView
+          customTrailingView:(UIView*)customTrailingView;
 
 @end
 

ios/chrome/browser/autofill/form_input_accessory_view.mm

@@ -86,43 +86,82 @@ constexpr CGFloat ManualFillSeparatorHeight = 0.5;
 
 @implementation FormInputAccessoryView
 
-- (void)setUpWithCustomView:(UIView*)customView {
-  [self addSubview:customView];
-  customView.translatesAutoresizingMaskIntoConstraints = NO;
-  AddSameConstraints(self, customView);
+#pragma mark - Public
 
-  [[self class] addBackgroundImageInView:self
-                           withImageName:@"autofill_keyboard_background"];
+- (void)setUpWithLeadingView:(UIView*)leadingView
+          customTrailingView:(UIView*)customTrailingView {
+  [self setUpWithLeadingView:leadingView
+          customTrailingView:customTrailingView
+          navigationDelegate:nil];
 }
 
-- (void)setUpWithNavigationDelegate:(id<FormInputAccessoryViewDelegate>)delegate
-                         customView:(UIView*)customView {
-  self.translatesAutoresizingMaskIntoConstraints = NO;
-  UIView* customViewContainer = [[UIView alloc] init];
-  customViewContainer.translatesAutoresizingMaskIntoConstraints = NO;
-  [self addSubview:customViewContainer];
+- (void)setUpWithLeadingView:(UIView*)leadingView
+          navigationDelegate:(id<FormInputAccessoryViewDelegate>)delegate {
+  [self setUpWithLeadingView:leadingView
+          customTrailingView:nil
+          navigationDelegate:delegate];
+}
 
-  [customViewContainer addSubview:customView];
-  customView.translatesAutoresizingMaskIntoConstraints = NO;
-  AddSameConstraints(customViewContainer, customView);
+#pragma mark - UIInputViewAudioFeedback
 
-  UIView* navigationView =
-      [self viewForNavigationButtonsUsingDelegate:delegate];
-  navigationView.translatesAutoresizingMaskIntoConstraints = NO;
-  [self addSubview:navigationView];
+- (BOOL)enableInputClicksWhenVisible {
+  return YES;
+}
+
+#pragma mark - Private Methods
+
+// Sets up the view with the given |leadingView|. If |delegate| is not nil,
+// navigation controls are shown on the right and use |delegate| for actions.
+// Else navigation controls are replaced with |customTrailingView|. If none of
+// |delegate| and |customTrailingView| is set, leadingView will take all the
+// space.
+- (void)setUpWithLeadingView:(UIView*)leadingView
+          customTrailingView:(UIView*)customTrailingView
+          navigationDelegate:(id<FormInputAccessoryViewDelegate>)delegate {
+  DCHECK(leadingView);
+  if (!autofill::features::IsPasswordManualFallbackEnabled()) {
+    [[self class] addBackgroundImageInView:self
+                             withImageName:@"autofill_keyboard_background"];
+  }
+  leadingView.translatesAutoresizingMaskIntoConstraints = NO;
+
+  UIView* trailingView;
+  if (delegate) {
+    trailingView = [self viewForNavigationButtonsUsingDelegate:delegate];
+  } else {
+    trailingView = customTrailingView;
+  }
+
+  // If there is no trailing view, set the leading view as the only view and
+  // return early.
+  if (!trailingView) {
+    [self addSubview:leadingView];
+    AddSameConstraints(self, leadingView);
+    return;
+  }
+
+  self.translatesAutoresizingMaskIntoConstraints = NO;
+  UIView* leadingViewContainer = [[UIView alloc] init];
+  leadingViewContainer.translatesAutoresizingMaskIntoConstraints = NO;
+  [self addSubview:leadingViewContainer];
+  [leadingViewContainer addSubview:leadingView];
+  AddSameConstraints(leadingViewContainer, leadingView);
+
+  trailingView.translatesAutoresizingMaskIntoConstraints = NO;
+  [self addSubview:trailingView];
 
   id<LayoutGuideProvider> layoutGuide = SafeAreaLayoutGuideForView(self);
   [NSLayoutConstraint activateConstraints:@[
-    [customViewContainer.topAnchor
+    [leadingViewContainer.topAnchor
         constraintEqualToAnchor:layoutGuide.topAnchor],
-    [customViewContainer.bottomAnchor
+    [leadingViewContainer.bottomAnchor
         constraintEqualToAnchor:layoutGuide.bottomAnchor],
-    [customViewContainer.leadingAnchor
+    [leadingViewContainer.leadingAnchor
         constraintEqualToAnchor:layoutGuide.leadingAnchor],
-    [navigationView.trailingAnchor
+    [trailingView.trailingAnchor
         constraintEqualToAnchor:layoutGuide.trailingAnchor],
-    [navigationView.topAnchor constraintEqualToAnchor:layoutGuide.topAnchor],
-    [navigationView.bottomAnchor
+    [trailingView.topAnchor constraintEqualToAnchor:layoutGuide.topAnchor],
+    [trailingView.bottomAnchor
         constraintEqualToAnchor:layoutGuide.bottomAnchor],
   ]];
 
@@ -135,7 +174,7 @@ constexpr CGFloat ManualFillSeparatorHeight = 0.5;
     UIImageView* gradientView =
         [[UIImageView alloc] initWithImage:gradientImage];
     gradientView.translatesAutoresizingMaskIntoConstraints = NO;
-    [self insertSubview:gradientView belowSubview:navigationView];
+    [self insertSubview:gradientView belowSubview:trailingView];
 
     UIView* topGrayLine = [[UIView alloc] init];
     topGrayLine.backgroundColor = UIColor.cr_manualFillSeparatorColor;
@@ -161,38 +200,26 @@ constexpr CGFloat ManualFillSeparatorHeight = 0.5;
       [bottomGrayLine.heightAnchor
           constraintEqualToConstant:ManualFillSeparatorHeight],
 
-      [gradientView.topAnchor constraintEqualToAnchor:navigationView.topAnchor],
+      [gradientView.topAnchor constraintEqualToAnchor:trailingView.topAnchor],
       [gradientView.bottomAnchor
-          constraintEqualToAnchor:navigationView.bottomAnchor],
+          constraintEqualToAnchor:trailingView.bottomAnchor],
       [gradientView.widthAnchor
           constraintEqualToConstant:ManualFillGradientWidth],
       [gradientView.trailingAnchor
-          constraintEqualToAnchor:navigationView.leadingAnchor
+          constraintEqualToAnchor:trailingView.leadingAnchor
                          constant:ManualFillGradientMargin],
 
-      [customViewContainer.trailingAnchor
-          constraintEqualToAnchor:navigationView.leadingAnchor],
+      [leadingViewContainer.trailingAnchor
+          constraintEqualToAnchor:trailingView.leadingAnchor],
     ]];
   } else {
-    [[self class] addBackgroundImageInView:self
-                             withImageName:@"autofill_keyboard_background"];
-    [customViewContainer.trailingAnchor
-        constraintEqualToAnchor:navigationView.leadingAnchor
+    [leadingViewContainer.trailingAnchor
+        constraintEqualToAnchor:trailingView.leadingAnchor
                        constant:kNavigationAreaSeparatorShadowWidth]
         .active = YES;
   }
 }
 
-#pragma mark -
-#pragma mark UIInputViewAudioFeedback
-
-- (BOOL)enableInputClicksWhenVisible {
-  return YES;
-}
-
-#pragma mark -
-#pragma mark Private Methods
-
 UIImage* ButtonImage(NSString* name) {
   UIImage* rawImage = [UIImage imageNamed:name];
   return StretchableImageFromUIImage(rawImage, 1, 0);

ios/chrome/browser/autofill/form_input_accessory_view_controller.mm

@@ -116,12 +116,6 @@ CGFloat const kInputAccessoryHeight = 44.0f;
                                          client:suggestionClient
                                     suggestions:suggestions];
 
-  // If Manual Fallback is enabled, add its view after the suggestions.
-  if (autofill::features::IsPasswordManualFallbackEnabled()) {
-    formSuggestionView.trailingView =
-        self.manualFillAccessoryViewController.view;
-  }
-
   if (IsIPadIdiom()) {
     // On iPad, there's no inputAccessoryView available, so we attach the custom
     // view directly to the keyboard view instead.
@@ -137,6 +131,8 @@ CGFloat const kInputAccessoryHeight = 44.0f;
     }
 
     if (!autofill::features::IsPasswordManualFallbackEnabled()) {
+      // Check that |manualFillAccessoryViewController| was not instantiated.
+      DCHECK(!self.manualFillAccessoryViewController);
       // If this is a form suggestion view and no suggestions have been
       // triggered yet, don't show the custom view.
       if (formSuggestionView) {
@@ -149,15 +145,19 @@ CGFloat const kInputAccessoryHeight = 44.0f;
       _suggestionsHaveBeenShown = YES;
     }
     self.customAccessoryView = [[FormInputAccessoryView alloc] init];
-    [self.customAccessoryView setUpWithCustomView:formSuggestionView];
+    [self.customAccessoryView
+        setUpWithLeadingView:formSuggestionView
+          customTrailingView:self.manualFillAccessoryViewController.view];
     [self addCustomAccessoryViewIfNeeded];
   } else {
     // On iPhone, the custom view replaces the default UI of the
     // inputAccessoryView.
     [self restoreOriginalInputAccessoryView];
+    formSuggestionView.trailingView =
+        self.manualFillAccessoryViewController.view;
     self.customAccessoryView = [[FormInputAccessoryView alloc] init];
-    [self.customAccessoryView setUpWithNavigationDelegate:navigationDelegate
-                                               customView:formSuggestionView];
+    [self.customAccessoryView setUpWithLeadingView:formSuggestionView
+                                navigationDelegate:navigationDelegate];
     [self addCustomAccessoryViewIfNeeded];
   }
 }

ios/chrome/browser/ui/autofill/form_input_accessory_coordinator.mm

@@ -5,6 +5,7 @@
 #import "ios/chrome/browser/ui/autofill/form_input_accessory_coordinator.h"
 
 #include "base/mac/foundation_util.h"
+#include "components/autofill/core/common/autofill_features.h"
 #import "components/autofill/ios/browser/js_suggestion_manager.h"
 #import "ios/chrome/browser/autofill/form_input_accessory_view_controller.h"
 #import "ios/chrome/browser/ui/autofill/form_input_accessory_mediator.h"
@@ -50,14 +51,6 @@
 
 @implementation FormInputAccessoryCoordinator
 
-@synthesize formInputAccessoryMediator = _formInputAccessoryMediator;
-@synthesize formInputAccessoryViewController =
-    _formInputAccessoryViewController;
-@synthesize manualFillAccessoryViewController =
-    _manualFillAccessoryViewController;
-@synthesize webStateList = _webStateList;
-@synthesize manualFillInjectionHandler = _manualFillInjectionHandler;
-
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
                               browserState:
                                   (ios::ChromeBrowserState*)browserState
@@ -75,11 +68,12 @@
     _formInputAccessoryViewController =
         [[FormInputAccessoryViewController alloc] init];
 
-    _manualFillAccessoryViewController =
-        [[ManualFillAccessoryViewController alloc] initWithDelegate:self];
-
-    _formInputAccessoryViewController.manualFillAccessoryViewController =
-        _manualFillAccessoryViewController;
+    if (autofill::features::IsPasswordManualFallbackEnabled()) {
+      _manualFillAccessoryViewController =
+          [[ManualFillAccessoryViewController alloc] initWithDelegate:self];
+      _formInputAccessoryViewController.manualFillAccessoryViewController =
+          _manualFillAccessoryViewController;
+    }
 
     _formInputAccessoryMediator = [[FormInputAccessoryMediator alloc]
         initWithConsumer:self.formInputAccessoryViewController