Revert "Use accent color in UI" (b54d960b) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/PeopleActivity.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -28,11 +28,8 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SyncStatusObserver;
		import android.content.res.Configuration;
		import android.content.res.TypedArray;
		import android.graphics.Color;
		import android.graphics.drawable.ColorDrawable;
		import android.net.Uri;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.provider.ContactsContract;
		@@ -50,14 +47,11 @@ import android.support.v7.app.ActionBarDrawerToggle;
		import android.support.v7.app.AppCompatActivity;
		import android.support.v7.widget.Toolbar;
		import android.util.Log;
		import android.util.TypedValue;
		import android.view.KeyCharacterMap;
		import android.view.KeyEvent;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.Window;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityEvent;
		import android.view.accessibility.AccessibilityManager;
		import android.widget.ImageButton;
		@@ -117,8 +111,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
		DrawerFragmentListener,
		SelectAccountDialogFragment.Listener {

		public static int ACCENT_COLOR = 0;

		/** Possible views of Contacts app. */
		public enum ContactsView {
		NONE,
		@@ -421,8 +413,6 @@ public class PeopleActivity extends AppCompatContactsActivity implements
		Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate finish");
		}
		getWindow().setBackgroundDrawable(null);

		ACCENT_COLOR=fetchAccentColor();
		}

		@Override
		@@ -1301,20 +1291,5 @@ public class PeopleActivity extends AppCompatContactsActivity implements
		return intent;
		}

		/*
		* get Accent color from OS
		* */

		private int fetchAccentColor() {
		TypedValue typedValue = new TypedValue();
		TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });
		int color = a.getColor(0, 0);
		a.recycle();
		Log.e("TAG", "accent Colour #"+Integer.toHexString(color));
		getSupportActionBar().setBackgroundDrawable(
		new ColorDrawable(color));
		return color;
		}


		}

src/com/android/contacts/drawer/DrawerAdapter.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.widget.TextView;

		import com.android.contacts.ContactPhotoManager;
		import com.android.contacts.R;
		import com.android.contacts.activities.PeopleActivity;
		import com.android.contacts.activities.PeopleActivity.ContactsView;
		import com.android.contacts.group.GroupListItem;
		import com.android.contacts.list.ContactListFilter;
		@@ -45,8 +44,6 @@ import com.android.contactsbind.ObjectFactory;
		import java.util.ArrayList;
		import java.util.List;

		import static com.android.contacts.activities.PeopleActivity.*;

		public class DrawerAdapter extends BaseAdapter {

		private static final int VIEW_TYPE_PRIMARY_ITEM = 0;
		@@ -263,9 +260,6 @@ public class DrawerAdapter extends BaseAdapter {
		titleView.setText(item.text);
		final ImageView iconView = (ImageView) result.findViewById(R.id.icon);
		iconView.setImageResource(item.icon);

		iconView.setColorFilter(ACCENT_COLOR, android.graphics.PorterDuff.Mode.MULTIPLY);

		final TextView newBadge = (TextView) result.findViewById(R.id.assistant_new_badge);
		final boolean showWelcomeBadge = !SharedPreferenceUtil.isWelcomeCardDismissed(mActivity);
		newBadge.setVisibility(item.contactsView == ContactsView.ASSISTANT && showWelcomeBadge
		@@ -404,9 +398,8 @@ public class DrawerAdapter extends BaseAdapter {
		textView.setTextAppearance(mActivity, activated
		? TYPEFACE_STYLE_ACTIVATE : TYPEFACE_STYLE_INACTIVE);
		if (activated) {
		imageView.setColorFilter(ACCENT_COLOR,
		imageView.setColorFilter(mActivity.getResources().getColor(R.color.primary_color),
		PorterDuff.Mode.SRC_ATOP);
		textView.setTextColor(ACCENT_COLOR);
		} else {
		imageView.clearColorFilter();
		}

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ import java.util.List;

		import javax.annotation.Nullable;

		import static com.android.contacts.activities.PeopleActivity.ACCENT_COLOR;

		/**
		* Shows a list of all available {@link Groups} available, letting the user
		* select which ones they want to be visible.
		@@ -602,10 +600,8 @@ public class CustomContactListFilterActivity extends Activity implements
		final int textColor = mContext.getResources().getColor(isExpanded
		? R.color.dialtacts_theme_color
		: R.color.account_filter_text_color);
		//text1.setTextColor(textColor);
		//text2.setTextColor(textColor);
		text1.setTextColor(ACCENT_COLOR);
		text2.setTextColor(ACCENT_COLOR);
		text1.setTextColor(textColor);
		text2.setTextColor(textColor);

		return convertView;
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -388,7 +388,6 @@ public abstract class MultiSelectContactsListFragment<T extends MultiSelectEntry
		accountFilterHeaderIcon.requestLayout();

		accountFilterHeaderIcon.setVisibility(View.VISIBLE);

		accountFilterHeaderIcon.setImageDrawable(icon);
		}