am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
  Fix print icons in settings.
This commit is contained in:
Svetoslav
2014-09-11 17:39:26 +00:00
committed by Android Git Automerger
4 changed files with 42 additions and 4 deletions

View File

@@ -204,12 +204,12 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
switch (info.getState()) {
case PrintJobInfo.STATE_QUEUED:
case PrintJobInfo.STATE_STARTED: {
mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
mPrintJobPreference.setIcon(R.drawable.ic_print);
} break;
case PrintJobInfo.STATE_FAILED:
case PrintJobInfo.STATE_BLOCKED: {
mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
mPrintJobPreference.setIcon(R.drawable.ic_print_error);
} break;
}

View File

@@ -423,12 +423,12 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
switch (printJob.getState()) {
case PrintJobInfo.STATE_QUEUED:
case PrintJobInfo.STATE_STARTED: {
preference.setIcon(com.android.internal.R.drawable.ic_print);
preference.setIcon(R.drawable.ic_print);
} break;
case PrintJobInfo.STATE_FAILED:
case PrintJobInfo.STATE_BLOCKED: {
preference.setIcon(com.android.internal.R.drawable.ic_print_error);
preference.setIcon(R.drawable.ic_print_error);
} break;
}