diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml
deleted file mode 100644
index 647838d0af9..00000000000
--- a/res/drawable/ic_print.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml
deleted file mode 100644
index 560aaab638c..00000000000
--- a/res/drawable/ic_print_error.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 349d9fccaad..7142e4967d2 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -17,6 +17,8 @@
package com.android.settings.print;
import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.print.PrintJob;
import android.print.PrintJobId;
@@ -31,8 +33,8 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-
import android.view.ViewGroup;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -220,16 +222,28 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
info.getCreationTime(), info.getCreationTime(), DateFormat.SHORT,
DateFormat.SHORT)));
+ TypedArray a = getActivity().obtainStyledAttributes(new int[]{
+ android.R.attr.colorControlNormal});
+ int tintColor = a.getColor(0, 0);
+ a.recycle();
+
switch (info.getState()) {
case PrintJobInfo.STATE_QUEUED:
case PrintJobInfo.STATE_STARTED: {
- mPrintJobPreference.setIcon(R.drawable.ic_print);
- } break;
+ Drawable icon = getActivity().getDrawable(com.android.internal.R.drawable.ic_print);
+ icon.setTint(tintColor);
+ mPrintJobPreference.setIcon(icon);
+ break;
+ }
case PrintJobInfo.STATE_FAILED:
case PrintJobInfo.STATE_BLOCKED: {
- mPrintJobPreference.setIcon(R.drawable.ic_print_error);
- } break;
+ Drawable icon = getActivity().getDrawable(
+ com.android.internal.R.drawable.ic_print_error);
+ icon.setTint(tintColor);
+ mPrintJobPreference.setIcon(icon);
+ break;
+ }
}
CharSequence status = info.getStatus(getPackageManager());
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 26e760c96f3..3d63000c595 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -24,6 +24,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.Loader;
import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
@@ -359,15 +360,29 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
printJob.getCreationTime(), printJob.getCreationTime(),
DateFormat.SHORT, DateFormat.SHORT)));
+ TypedArray a = getActivity().obtainStyledAttributes(new int[]{
+ android.R.attr.colorControlNormal});
+ int tintColor = a.getColor(0, 0);
+ a.recycle();
+
switch (printJob.getState()) {
case PrintJobInfo.STATE_QUEUED:
- case PrintJobInfo.STATE_STARTED:
- preference.setIcon(R.drawable.ic_print);
+ case PrintJobInfo.STATE_STARTED: {
+ Drawable icon = getActivity().getDrawable(
+ com.android.internal.R.drawable.ic_print);
+ icon.setTint(tintColor);
+ preference.setIcon(icon);
break;
+ }
+
case PrintJobInfo.STATE_FAILED:
- case PrintJobInfo.STATE_BLOCKED:
- preference.setIcon(R.drawable.ic_print_error);
+ case PrintJobInfo.STATE_BLOCKED: {
+ Drawable icon = getActivity().getDrawable(
+ com.android.internal.R.drawable.ic_print_error);
+ icon.setTint(tintColor);
+ preference.setIcon(icon);
break;
+ }
}
Bundle extras = preference.getExtras();