Index: trunk/src/ui/android/java/src/org/chromium/ui/autofill/AutofillListAdapter.java |
=================================================================== |
--- trunk/src/ui/android/java/src/org/chromium/ui/autofill/AutofillListAdapter.java (revision 234202) |
+++ trunk/src/ui/android/java/src/org/chromium/ui/autofill/AutofillListAdapter.java (working copy) |
@@ -6,23 +6,17 @@ |
package org.chromium.ui.autofill; |
import android.content.Context; |
-import android.content.res.Resources; |
-import android.graphics.Color; |
-import android.graphics.drawable.LayerDrawable; |
import android.text.TextUtils; |
+ |
import android.view.LayoutInflater; |
import android.view.View; |
import android.view.ViewGroup; |
-import android.widget.AbsListView.LayoutParams; |
import android.widget.ArrayAdapter; |
import android.widget.TextView; |
import org.chromium.ui.R; |
-import org.chromium.base.ApiCompatibilityUtils; |
- |
import java.util.ArrayList; |
-import java.util.Set; |
/** |
* Autofill suggestion adapter for AutofillWindow. |
@@ -29,13 +23,9 @@ |
*/ |
public class AutofillListAdapter extends ArrayAdapter<AutofillSuggestion> { |
private Context mContext; |
- private Set<Integer> mSeparators; |
- AutofillListAdapter(Context context, |
- ArrayList<AutofillSuggestion> objects, |
- Set<Integer> separators) { |
+ AutofillListAdapter(Context context, ArrayList<AutofillSuggestion> objects) { |
super(context, R.layout.autofill_text, objects); |
- mSeparators = separators; |
mContext = context; |
} |
@@ -46,30 +36,10 @@ |
LayoutInflater inflater = |
(LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); |
layout = inflater.inflate(R.layout.autofill_text, null); |
- ApiCompatibilityUtils.setBackgroundForView(layout, new AutofillDividerDrawable()); |
} |
TextView labelView = (TextView) layout.findViewById(R.id.autofill_label); |
labelView.setText(getItem(position).mLabel); |
- AutofillDividerDrawable divider = (AutofillDividerDrawable) layout.getBackground(); |
- int height = mContext.getResources().getDimensionPixelSize(R.dimen.autofill_text_height); |
- if (position == 0) { |
- divider.setColor(Color.TRANSPARENT); |
- } else { |
- int dividerHeight = mContext.getResources().getDimensionPixelSize( |
- R.dimen.autofill_text_divider_height); |
- height += dividerHeight; |
- divider.setHeight(dividerHeight); |
- if (mSeparators.contains(position)) { |
- divider.setColor(mContext.getResources().getColor( |
- R.color.autofill_dark_divider_color)); |
- } else { |
- divider.setColor(mContext.getResources().getColor( |
- R.color.autofill_divider_color)); |
- } |
- } |
- layout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, height)); |
- |
TextView sublabelView = (TextView) layout.findViewById(R.id.autofill_sublabel); |
CharSequence sublabel = getItem(position).mSublabel; |
if (TextUtils.isEmpty(sublabel)) { |