Merge 187018

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java

 // Copyright (c) 2012 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.autofill;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Paint;
 import android.graphics.Point;
@@ skipping 40 matching lines @@
     private AnchorView mAnchorView;
     private Rect mAnchorRect;
     private Paint mNameViewPaint;
     private Paint mLabelViewPaint;
 
     /**
      * An interface to handle the touch interaction with an AutofillPopup object.
      */
     public interface AutofillPopupDelegate {
         /**
-         * Confirms the dismissal of the java AutofillPopup object.
+         * Requests the controller to hide AutofillPopup.
          */
-        public void dismissed();
+        public void requestHide();
 
         /**
          * Handles the selection of an Autofill suggestion from an AutofillPopup.
          * @param listIndex The index of the selected Autofill suggestion.
          */
         public void suggestionSelected(int listIndex);
     }
 
     // ListPopupWindow needs an anchor view to determine it's size and position.  We create a view
     // with the given desired width at the text edit area as a stand-in.  This is "Fake" in the
@@ skipping 94 matching lines @@
             if (itemId > 0 || itemId == ITEM_ID_AUTOCOMPLETE_ENTRY ||
                     itemId == ITEM_ID_PASSWORD_ENTRY || itemId == ITEM_ID_DATA_LIST_ENTRY) {
                 cleanedData.add(suggestions[i]);
             }
         }
         setAdapter(new AutofillListAdapter(mNativeWindow.getContext(), cleanedData));
         // Once the mAnchorRect is resized and placed correctly, it will show the Autofill popup.
         mAnchorView.setSize(mAnchorRect, getDesiredWidth(suggestions));
     }
 
+
     /**
-     * Dismisses the popup and calls to mAutofillCallback.dismissed().
+     * Overrides the default dismiss behavior to request the controller to dismiss the view.
      */
     @Override
     public void dismiss() {
-        super.dismiss();
-        mContainerViewDelegate.removeViewFromContainerView(mAnchorView);
-        mAutofillCallback.dismissed();
+        mAutofillCallback.requestHide();
     }
 
     /**
+     * Hides the popup and removes the anchor view from the ContainerView.
+     */
+    public void hide() {
+        super.dismiss();
+        mContainerViewDelegate.removeViewFromContainerView(mAnchorView);
+    }
+
+    /**
      * Get desired popup window width by calculating the maximum text length from Autofill data.
      * @param data Autofill suggestion data.
      * @return The popup window width.
      */
     private int getDesiredWidth(AutofillSuggestion[] data) {
         if (mNameViewPaint == null || mLabelViewPaint == null) {
             LayoutInflater inflater =
                     (LayoutInflater) mNativeWindow.getContext().getSystemService(
                             Context.LAYOUT_INFLATER_SERVICE);
             View layout = inflater.inflate(R.layout.autofill_text, null);
@@ skipping 22 matching lines @@
         return maxTextWidth + (int) (TEXT_PADDING_DP *
                 mNativeWindow.getContext().getResources().getDisplayMetrics().density);
     }
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         mAutofillCallback.suggestionSelected(position);
     }
 
 }