Revert 234194 "Add support for datalist to text input element on..."

trunk/src/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java

 // Copyright 2013 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.ui.autofill;
 
 import android.content.Context;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.widget.AdapterView;
 import android.widget.ListPopupWindow;
 import android.widget.TextView;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
 
 import org.chromium.ui.R;
 import org.chromium.ui.ViewAndroidDelegate;
 
 /**
  * The Autofill suggestion popup that lists relevant suggestions.
  */
 public class AutofillPopup extends ListPopupWindow implements AdapterView.OnItemClickListener {
 
     /**
      * Constants defining types of Autofill suggestion entries.
      * Has to be kept in sync with enum in WebAutofillClient.h
      *
-     * Not supported: MenuItemIDWarningMessage, MenuItemIDClearForm, and
+     * Not supported: MenuItemIDWarningMessage, MenuItemIDSeparator, MenuItemIDClearForm, and
      * MenuItemIDAutofillOptions.
      */
     private static final int ITEM_ID_AUTOCOMPLETE_ENTRY = 0;
     private static final int ITEM_ID_PASSWORD_ENTRY = -2;
-    private static final int ITEM_ID_SEPARATOR_ENTRY = -3;
     private static final int ITEM_ID_DATA_LIST_ENTRY = -6;
 
     private static final int TEXT_PADDING_DP = 30;
 
     private final AutofillPopupDelegate mAutofillCallback;
     private final Context mContext;
     private final ViewAndroidDelegate mViewAndroidDelegate;
     private View mAnchorView;
     private float mAnchorWidth;
     private float mAnchorHeight;
     private float mAnchorX;
     private float mAnchorY;
     private Paint mLabelViewPaint;
     private Paint mSublabelViewPaint;
     private OnLayoutChangeListener mLayoutChangeListener;
-    private List<AutofillSuggestion> mSuggestions;
 
     /**
      * An interface to handle the touch interaction with an AutofillPopup object.
      */
     public interface AutofillPopupDelegate {
         /**
          * Requests the controller to hide AutofillPopup.
          */
         public void requestHide();
 
@@ skipping 36 matching lines @@
 
         mAnchorView.addOnLayoutChangeListener(mLayoutChangeListener);
         setAnchorView(mAnchorView);
     }
 
     @Override
     public void show() {
         // An ugly hack to keep the popup from expanding on top of the keyboard.
         setInputMethodMode(INPUT_METHOD_NEEDED);
         super.show();
-        getListView().setDividerHeight(0);
     }
 
     /**
      * Sets the location and the size of the anchor view that the AutofillPopup will use to attach
      * itself.
      * @param x X coordinate of the top left corner of the anchor view.
      * @param y Y coordinate of the top left corner of the anchor view.
      * @param width The width of the anchor view.
      * @param height The height of the anchor view.
      */
     public void setAnchorRect(float x, float y, float width, float height) {
         mAnchorWidth = width;
         mAnchorHeight = height;
         mAnchorX = x;
         mAnchorY = y;
         if (mAnchorView != null) {
             mViewAndroidDelegate.setAnchorViewPosition(mAnchorView, mAnchorX, mAnchorY,
                     mAnchorWidth, mAnchorHeight);
         }
     }
 
     /**
      * Sets the Autofill suggestions to display in the popup and shows the popup.
      * @param suggestions Autofill suggestion data.
      */
     public void show(AutofillSuggestion[] suggestions) {
-        mSuggestions = new ArrayList<AutofillSuggestion>(Arrays.asList(suggestions));
         // Remove the AutofillSuggestions with IDs that are not supported by Android
         ArrayList<AutofillSuggestion> cleanedData = new ArrayList<AutofillSuggestion>();
-        HashSet<Integer> separators = new HashSet<Integer>();
         for (int i = 0; i < suggestions.length; i++) {
             int itemId = suggestions[i].mUniqueId;
             if (itemId > 0 || itemId == ITEM_ID_AUTOCOMPLETE_ENTRY ||
                     itemId == ITEM_ID_PASSWORD_ENTRY || itemId == ITEM_ID_DATA_LIST_ENTRY) {
                 cleanedData.add(suggestions[i]);
-            } else if (itemId == ITEM_ID_SEPARATOR_ENTRY) {
-                separators.add(cleanedData.size());
             }
         }
-        setAdapter(new AutofillListAdapter(mContext, cleanedData, separators));
+        setAdapter(new AutofillListAdapter(mContext, cleanedData));
         // Once the mAnchorRect is resized and placed correctly, it will show the Autofill popup.
         mAnchorWidth = Math.max(getDesiredWidth(cleanedData), mAnchorWidth);
         mViewAndroidDelegate.setAnchorViewPosition(mAnchorView, mAnchorX, mAnchorY, mAnchorWidth,
                 mAnchorHeight);
     }
 
     /**
      * Overrides the default dismiss behavior to request the controller to dismiss the view.
      */
     @Override
@@ skipping 47 matching lines @@
             maxTextWidth = Math.max(maxTextWidth, localMax);
         }
         // Scale it down to make it unscaled by screen density.
         maxTextWidth = maxTextWidth / mContext.getResources().getDisplayMetrics().density;
         // Adding padding.
         return maxTextWidth + TEXT_PADDING_DP;
     }
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        AutofillListAdapter adapter = (AutofillListAdapter) parent.getAdapter();
-        int listIndex = mSuggestions.indexOf(adapter.getItem(position));
-        assert listIndex > -1;
-        mAutofillCallback.suggestionSelected(listIndex);
+        mAutofillCallback.suggestionSelected(position);
     }
 
 }