diff options
Diffstat (limited to 'src/com/android/contacts/common/list/ContactListItemView.java')
| -rw-r--r-- | src/com/android/contacts/common/list/ContactListItemView.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java index 95ac3920..6b9492bf 100644 --- a/src/com/android/contacts/common/list/ContactListItemView.java +++ b/src/com/android/contacts/common/list/ContactListItemView.java @@ -916,7 +916,7 @@ public class ContactListItemView extends ViewGroup mNameTextView = new TextView(mContext); mNameTextView.setSingleLine(true); mNameTextView.setEllipsize(getTextEllipsis()); - mNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Medium); + mNameTextView.setTextAppearance(mContext, R.style.TextAppearanceMedium); // Manually call setActivated() since this view may be added after the first // setActivated() call toward this whole item view. mNameTextView.setActivated(isActivated()); @@ -983,9 +983,9 @@ public class ContactListItemView extends ViewGroup mLabelView = new TextView(mContext); mLabelView.setSingleLine(true); mLabelView.setEllipsize(getTextEllipsis()); - mLabelView.setTextAppearance(mContext, android.R.style.TextAppearance_Small); + mLabelView.setTextAppearance(mContext, R.style.TextAppearanceSmall); if (mPhotoPosition == PhotoPosition.LEFT) { - mLabelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mCountViewTextSize); + //mLabelView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mCountViewTextSize); mLabelView.setAllCaps(true); mLabelView.setGravity(Gravity.END); } else { @@ -1072,7 +1072,7 @@ public class ContactListItemView extends ViewGroup mDataView = new TextView(mContext); mDataView.setSingleLine(true); mDataView.setEllipsize(getTextEllipsis()); - mDataView.setTextAppearance(mContext, android.R.style.TextAppearance_Small); + mDataView.setTextAppearance(mContext, R.style.TextAppearanceSmall); mDataView.setActivated(isActivated()); mDataView.setId(R.id.cliv_data_view); addView(mDataView); @@ -1103,7 +1103,6 @@ public class ContactListItemView extends ViewGroup mSnippetView.setSingleLine(true); mSnippetView.setEllipsize(getTextEllipsis()); mSnippetView.setTextAppearance(mContext, android.R.style.TextAppearance_Small); - mSnippetView.setTypeface(mSnippetView.getTypeface(), Typeface.BOLD); mSnippetView.setActivated(isActivated()); addView(mSnippetView); } @@ -1535,7 +1534,10 @@ public class ContactListItemView extends ViewGroup public boolean onTouchEvent(MotionEvent event) { final float x = event.getX(); final float y = event.getY(); - if (mBoundsWithoutHeader.contains((int) x, (int) y)) { + // If the touch event's coordinates are not within the view's header, then delegate + // to super.onTouchEvent so that regular view behavior is preserved. Otherwise, consume + // and ignore the touch event. + if (mBoundsWithoutHeader.contains((int) x, (int) y) || !pointInView(x, y, 0)) { return super.onTouchEvent(event); } else { return true; |