Merge "Introduce xmls for primary/secondary text colors" (6295e5bf) · Commits · e / os / android_packages_apps_Contacts

res/color/list_primary_text_color.xml→res/color/primary_text_color.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		<selector xmlns:android="http://schemas.android.com/apk/res/android">

		<item android:state_activated="true" android:color="@color/primary_text_color_activated"/>
		<item android:color="@color/primary_text_color" /> <!-- not selected -->
		<item android:state_activated="true" android:color="#FFFFFF" />
		<item android:color="#333333" /> <!-- not selected -->

		</selector>

res/color/list_secondary_text_color.xml→res/color/secondary_text_color.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		<selector xmlns:android="http://schemas.android.com/apk/res/android">

		<item android:state_activated="true" android:color="@color/secondary_text_color_activated" />
		<item android:color="@color/secondary_text_color" /> <!-- not selected -->
		<item android:state_activated="true" android:color="#FFFFFF" />
		<item android:color="#777777" /> <!-- not selected -->

		</selector>

res/layout/group_browse_list_item.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="@color/list_primary_text_color"
		android:ellipsize="end"
		android:singleLine="true" />

		@@ -80,7 +79,7 @@
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="@color/list_secondary_text_color"
		android:textColor="?android:attr/textColorSecondary"
		android:ellipsize="end"
		android:singleLine="true" />

res/values/colors.xml

+1 −11

Original line number	Diff line number	Diff line
		@@ -80,19 +80,9 @@
		<!-- Color of the theme of the People app -->
		<color name="people_app_theme_color">#33B5E5</color>

		<!-- Primary text color in the People app -->
		<color name="primary_text_color">#333333</color>

		<!-- Activated primary text color in the People app -->
		<color name="primary_text_color_activated">#FFFFFF</color>

		<!-- Secondary text color in the People app -->
		<color name="secondary_text_color">#777777</color>
		<!-- Secondary text color in the Phone app -->
		<color name="dialtacts_secondary_text_color">#888888</color>

		<!-- Activated secondary text color in the People app -->
		<color name="secondary_text_color_activated">#FFFFFF</color>

		<!-- Colors in the contact browser list -->
		<color name="contact_count_text_color">#AAAAAA</color>

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ public class ContactListItemView extends ViewGroup
		private TextView mCountView;
		private ImageView mPresenceIcon;

		private ColorStateList mPrimaryTextColor;
		private ColorStateList mSecondaryTextColor;

		private char[] mHighlightedPrefix;
		@@ -252,8 +251,9 @@ public class ContactListItemView extends ViewGroup
		Color.GREEN));
		a.recycle();

		mPrimaryTextColor = getResources().getColorStateList(R.color.list_primary_text_color);
		mSecondaryTextColor = getResources().getColorStateList(R.color.list_secondary_text_color);
		a = getContext().obtainStyledAttributes(android.R.styleable.Theme);
		mSecondaryTextColor = a.getColorStateList(android.R.styleable.Theme_textColorSecondary);
		a.recycle();

		mHorizontalDividerHeight = mHorizontalDividerDrawable.getIntrinsicHeight();

		@@ -766,7 +766,6 @@ public class ContactListItemView extends ViewGroup
		mNameTextView.setSingleLine(true);
		mNameTextView.setEllipsize(getTextEllipsis());
		mNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Medium);
		mNameTextView.setTextColor(mPrimaryTextColor);
		// Manually call setActivated() since this view may be added after the first
		// setActivated() call toward this whole item view.
		mNameTextView.setActivated(isActivated());
		@@ -826,7 +825,6 @@ public class ContactListItemView extends ViewGroup
		mPhoneticNameTextView.setEllipsize(getTextEllipsis());
		mPhoneticNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
		mPhoneticNameTextView.setTypeface(mPhoneticNameTextView.getTypeface(), Typeface.BOLD);
		mPhoneticNameTextView.setTextColor(mPrimaryTextColor);
		mPhoneticNameTextView.setActivated(isActivated());
		addView(mPhoneticNameTextView);
		}
		@@ -873,7 +871,6 @@ public class ContactListItemView extends ViewGroup
		mLabelView.setEllipsize(getTextEllipsis());
		mLabelView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
		mLabelView.setTypeface(mLabelView.getTypeface(), Typeface.BOLD);
		mLabelView.setTextColor(mPrimaryTextColor);
		mLabelView.setActivated(isActivated());
		addView(mLabelView);
		}
		@@ -905,7 +902,6 @@ public class ContactListItemView extends ViewGroup
		mDataView.setSingleLine(true);
		mDataView.setEllipsize(getTextEllipsis());
		mDataView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
		mDataView.setTextColor(mPrimaryTextColor);
		mDataView.setActivated(isActivated());
		addView(mDataView);
		}
		@@ -936,7 +932,6 @@ public class ContactListItemView extends ViewGroup
		mSnippetView.setEllipsize(getTextEllipsis());
		mSnippetView.setTextAppearance(mContext, android.R.style.TextAppearance_Small);
		mSnippetView.setTypeface(mSnippetView.getTypeface(), Typeface.BOLD);
		mSnippetView.setTextColor(mPrimaryTextColor);
		mSnippetView.setActivated(isActivated());
		addView(mSnippetView);
		}