Merge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError()... (5cbad094) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/Utils.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -202,13 +202,21 @@ public class Utils {
		return statusString;
		}

		public static ColorStateList getColorAccent(Context context) {
		return getColorAttr(context, android.R.attr.colorAccent);
		}

		public static ColorStateList getColorError(Context context) {
		return getColorAttr(context, android.R.attr.colorError);
		}

		@ColorInt
		public static int getColorAccent(Context context) {
		public static int getColorAccentDefaultColor(Context context) {
		return getColorAttrDefaultColor(context, android.R.attr.colorAccent);
		}

		@ColorInt
		public static int getColorError(Context context) {
		public static int getColorErrorDefaultColor(Context context) {
		return getColorAttrDefaultColor(context, android.R.attr.colorError);
		}

		@@ -216,7 +224,6 @@ public class Utils {
		public static int getColorStateListDefaultColor(Context context, int resId) {
		final ColorStateList list =
		context.getResources().getColorStateList(resId, context.getTheme());

		return list.getDefaultColor();
		}

packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ public class KeyguardHostView extends FrameLayout implements SecurityCallback {
		}

		public void showErrorMessage(CharSequence message) {
		showMessage(message, Utils.getColorError(mContext));
		showMessage(message, Utils.getColorErrorDefaultColor(mContext));
		}

		/**

packages/SystemUI/src/com/android/systemui/qs/DataUsageGraph.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.qs;

		import android.content.Context;
		import android.content.res.Resources;
		import android.content.res.ColorStateList;
		import android.graphics.Canvas;
		import android.graphics.Paint;
		import android.graphics.RectF;
		@@ -49,8 +50,8 @@ public class DataUsageGraph extends View {
		R.color.data_usage_graph_track);
		mWarningColor = Utils.getColorStateListDefaultColor(context,
		R.color.data_usage_graph_warning);
		mUsageColor = Utils.getColorAccent(context);
		mOverlimitColor = Utils.getColorError(context);
		mUsageColor = Utils.getColorAccentDefaultColor(context);
		mOverlimitColor = Utils.getColorErrorDefaultColor(context);
		mMarkerWidth = res.getDimensionPixelSize(R.dimen.data_usage_graph_marker_width);
		}

packages/SystemUI/src/com/android/systemui/qs/tiles/DataUsageDetailView.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.ColorInt;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.content.res.ColorStateList;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;
		@@ -66,7 +67,7 @@ public class DataUsageDetailView extends LinearLayout {
		final Resources res = mContext.getResources();
		final int titleId;
		final long bytes;
		@ColorInt int usageColor = 0;
		ColorStateList usageColorState = null;
		final String top;
		String bottom = null;
		if (info.usageLevel < info.warningLevel \|\| info.limitLevel <= 0) {
		@@ -91,18 +92,18 @@ public class DataUsageDetailView extends LinearLayout {
		formatBytes(info.usageLevel));
		bottom = res.getString(R.string.quick_settings_cellular_detail_data_limit,
		formatBytes(info.limitLevel));
		usageColor = Utils.getColorStateListDefaultColor(mContext, android.R.attr.colorError);
		usageColorState = Utils.getColorError(mContext);
		}

		if (usageColor == 0) {
		usageColor = Utils.getColorAccent(mContext);
		if (usageColorState == null) {
		usageColorState = Utils.getColorAccent(mContext);
		}

		final TextView title = findViewById(android.R.id.title);
		title.setText(titleId);
		final TextView usage = findViewById(R.id.usage_text);
		usage.setText(formatBytes(bytes));
		usage.setTextColor(usageColor);
		usage.setTextColor(usageColorState);
		final DataUsageGraph graph = findViewById(R.id.usage_graph);
		graph.setLevels(info.limitLevel, info.warningLevel, info.usageLevel);
		final TextView carrier = findViewById(R.id.usage_carrier_text);

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.content.Intent;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageInfo;
		import android.content.pm.ResolveInfo;
		import android.content.res.ColorStateList;
		import android.graphics.drawable.Icon;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		@@ -609,9 +610,8 @@ public final class KeyboardShortcuts {
		TextView categoryTitle = (TextView) inflater.inflate(
		R.layout.keyboard_shortcuts_category_title, keyboardShortcutsLayout, false);
		categoryTitle.setText(group.getLabel());
		categoryTitle.setTextColor(group.isSystemGroup()
		? Utils.getColorAccent(mContext)
		: mContext.getColor(R.color.ksh_application_group_color));
		categoryTitle.setTextColor(group.isSystemGroup() ? Utils.getColorAccent(mContext) :
		ColorStateList.valueOf(mContext.getColor(R.color.ksh_application_group_color)));
		keyboardShortcutsLayout.addView(categoryTitle);

		LinearLayout shortcutContainer = (LinearLayout) inflater.inflate(