Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9584a27c authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Set correct forecolor when searching" into jb-dev

parents 58dc615b 1a6aae19

res/values-sw580dp/styles.xml

+1 −3
Original line number Diff line number Diff line
@@ -32,12 +32,11 @@ 
        <item name="list_item_padding_left">0dip</item>

        <item name="list_item_gap_between_image_and_text">8dip</item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_call_button_padding">14dip</item>

        <item name="list_item_vertical_divider_margin">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_photo_size">64dip</item>

        <item name="list_item_profile_photo_size">80dip</item>

        <item name="list_item_prefix_highlight_color">#99cc00</item>

        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_indent">8dip</item>

        <item name="list_item_header_text_size">14sp</item>

        <item name="list_item_header_text_color">@color/people_app_theme_color</item>
@@ -68,7 +67,6 @@ 
        <item name="list_item_padding_left">0dip</item>

        <item name="list_item_gap_between_image_and_text">8dip</item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_call_button_padding">14dip</item>

        <item name="list_item_vertical_divider_margin">5dip</item>

        <item name="list_item_presence_icon_margin">18dip</item>

        <item name="list_item_photo_size">64dip</item>

res/values-sw680dp/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -32,12 +32,11 @@ 
        <item name="list_item_padding_left">0dip</item>

        <item name="list_item_gap_between_image_and_text">16dip</item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_call_button_padding">14dip</item>

        <item name="list_item_vertical_divider_margin">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_photo_size">64dip</item>

        <item name="list_item_profile_photo_size">80dip</item>

        <item name="list_item_prefix_highlight_color">#99cc00</item>

        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_indent">8dip</item>

        <item name="list_item_header_text_color">@color/people_app_theme_color</item>

        <item name="list_item_header_height">24dip</item>

res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ 
        <attr name="list_item_padding_left" format="dimension"/>

        <attr name="list_item_gap_between_image_and_text" format="dimension"/>

        <attr name="list_item_gap_between_label_and_data" format="dimension"/>

        <attr name="list_item_call_button_padding" format="dimension"/>

        <attr name="list_item_vertical_divider_margin" format="dimension"/>

        <attr name="list_item_presence_icon_margin" format="dimension"/>

        <attr name="list_item_presence_icon_size" format="dimension"/>

res/values/styles.xml

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
        <item name="list_item_padding_left">0dip</item>

        <item name="list_item_gap_between_image_and_text">8dip</item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_call_button_padding">14dip</item>

        <item name="list_item_vertical_divider_margin">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_presence_icon_size">16dip</item>
@@ -145,13 +144,12 @@ 
        <item name="list_item_padding_left">0dip</item>

        <item name="list_item_gap_between_image_and_text">8dip</item>

        <item name="list_item_gap_between_label_and_data">5dip</item>

        <item name="list_item_call_button_padding">14dip</item>

        <item name="list_item_vertical_divider_margin">5dip</item>

        <item name="list_item_presence_icon_margin">4dip</item>

        <item name="list_item_presence_icon_size">16dip</item>

        <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>

        <item name="list_item_profile_photo_size">70dip</item>

        <item name="list_item_prefix_highlight_color">#99cc00</item>

        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_size">14sp</item>

        <item name="list_item_header_height">26dip</item>

src/com/android/contacts/list/ContactListItemView.java

+7 −20
Original line number Diff line number Diff line
@@ -70,14 +70,11 @@ public class ContactListItemView extends ViewGroup 
    private static final int QUICK_CONTACT_BADGE_STYLE =

            com.android.internal.R.attr.quickContactBadgeStyleWindowMedium;



    protected final Context mContext;



    // Style values for layout and appearance

    private final int mPreferredHeight;

    private final int mVerticalDividerMargin;

    private final int mGapBetweenImageAndText;

    private final int mGapBetweenLabelAndData;

    private final int mCallButtonPadding;

    private final int mPresenceIconMargin;

    private final int mPresenceIconSize;

    private final int mHeaderTextColor;
@@ -186,7 +183,6 @@ public class ContactListItemView extends ViewGroup 
    // same row.

    private int mLabelAndDataViewMaxHeight;



    private OnClickListener mCallButtonClickListener;

    // TODO: some TextView fields are using CharArrayBuffer while some are not. Determine which is

    // more efficient for each case or in general, and simplify the whole implementation.

    // Note: if we're sure MARQUEE will be used every time, there's no reason to use
@@ -201,7 +197,7 @@ public class ContactListItemView extends ViewGroup 
    private Rect mBoundsWithoutHeader = new Rect();



    /** A helper used to highlight a prefix in a text field. */

    private PrefixHighlighter mPrefixHighligher;

    private PrefixHighlighter mPrefixHighlighter;

    private CharSequence mUnknownNameText;



    /**
@@ -244,8 +240,6 @@ public class ContactListItemView extends ViewGroup 
                R.styleable.ContactListItemView_list_item_gap_between_image_and_text, 0);

        mGapBetweenLabelAndData = a.getDimensionPixelOffset(

                R.styleable.ContactListItemView_list_item_gap_between_label_and_data, 0);

        mCallButtonPadding = a.getDimensionPixelOffset(

                R.styleable.ContactListItemView_list_item_call_button_padding, 0);

        mPresenceIconMargin = a.getDimensionPixelOffset(

                R.styleable.ContactListItemView_list_item_presence_icon_margin, 4);

        mPresenceIconSize = a.getDimensionPixelOffset(
@@ -285,9 +279,9 @@ public class ContactListItemView extends ViewGroup 
                a.getDimensionPixelOffset(

                        R.styleable.ContactListItemView_list_item_padding_bottom, 0));



        mPrefixHighligher = new PrefixHighlighter(

                a.getColor(R.styleable.ContactListItemView_list_item_prefix_highlight_color,

                        Color.GREEN));

        final int prefixHighlightColor = a.getColor(

                R.styleable.ContactListItemView_list_item_prefix_highlight_color, Color.GREEN);

        mPrefixHighlighter = new PrefixHighlighter(prefixHighlightColor);

        a.recycle();



        a = getContext().obtainStyledAttributes(android.R.styleable.Theme);
@@ -301,13 +295,6 @@ public class ContactListItemView extends ViewGroup 
        }

    }



    /**

     * Installs a call button listener.

     */

    public void setOnCallButtonClickListener(OnClickListener callButtonClickListener) {

        mCallButtonClickListener = callButtonClickListener;

    }



    public void setUnknownNameText(CharSequence unknownNameText) {

        mUnknownNameText = unknownNameText;

    }
@@ -841,7 +828,7 @@ public class ContactListItemView extends ViewGroup 
                mPhotoView = new ImageView(mContext);

            }

            // Quick contact style used above will set a background - remove it

            mPhotoView.setBackgroundDrawable(null);

            mPhotoView.setBackground(null);

            addView(mPhotoView);

            mPhotoViewWidthAndHeightAreReady = false;

        }
@@ -1033,7 +1020,7 @@ public class ContactListItemView extends ViewGroup 
                mSnippetView.setVisibility(View.GONE);

            }

        } else {

            mPrefixHighligher.setText(getSnippetView(), text, mHighlightedPrefix);

            mPrefixHighlighter.setText(getSnippetView(), text, mHighlightedPrefix);

            mSnippetView.setVisibility(VISIBLE);

        }

    }
@@ -1144,7 +1131,7 @@ public class ContactListItemView extends ViewGroup 
    public void showDisplayName(Cursor cursor, int nameColumnIndex, int displayOrder) {

        CharSequence name = cursor.getString(nameColumnIndex);

        if (!TextUtils.isEmpty(name)) {

            name = mPrefixHighligher.apply(name, mHighlightedPrefix);

            name = mPrefixHighlighter.apply(name, mHighlightedPrefix);

        } else {

            name = mUnknownNameText;

        }