diff --git a/res/values/strings.xml b/res/values/strings.xml index e32ac43c830..a364c94c339 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3472,6 +3472,9 @@ Printing %1$s + + Cancelling %1$s + Printer error %1$s diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index cfb4cb203f1..f420a82a2c8 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -19,7 +19,6 @@ package com.android.settings.print; import android.app.ActivityManager; import android.content.Context; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.os.Bundle; import android.preference.Preference; import android.print.PrintJob; @@ -113,9 +112,11 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); - MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE, - getString(R.string.print_cancel)); - cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + if (!mPrintJob.getInfo().isCancelling()) { + MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE, + getString(R.string.print_cancel)); + cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + } if (mPrintJob.isFailed()) { MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE, @@ -169,8 +170,13 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { switch (info.getState()) { case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { - mPrintJobPreference.setTitle(getString( - R.string.print_printing_state_title_template, info.getLabel())); + if (!mPrintJob.getInfo().isCancelling()) { + mPrintJobPreference.setTitle(getString( + R.string.print_printing_state_title_template, info.getLabel())); + } else { + mPrintJobPreference.setTitle(getString( + R.string.print_cancelling_state_title_template, info.getLabel())); + } } break; case PrintJobInfo.STATE_FAILED: { @@ -179,8 +185,13 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { } break; case PrintJobInfo.STATE_BLOCKED: { - mPrintJobPreference.setTitle(getString( - R.string.print_blocked_state_title_template, info.getLabel())); + if (!mPrintJob.getInfo().isCancelling()) { + mPrintJobPreference.setTitle(getString( + R.string.print_blocked_state_title_template, info.getLabel())); + } else { + mPrintJobPreference.setTitle(getString( + R.string.print_cancelling_state_title_template, info.getLabel())); + } } break; } diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 391d5051cec..df38db4e5ab 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -376,9 +376,15 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment implements switch (printJob.getState()) { case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { - preference.setTitle(getString( - R.string.print_printing_state_title_template, - printJob.getLabel())); + if (!printJob.isCancelling()) { + preference.setTitle(getString( + R.string.print_printing_state_title_template, + printJob.getLabel())); + } else { + preference.setTitle(getString( + R.string.print_cancelling_state_title_template, + printJob.getLabel())); + } } break; case PrintJobInfo.STATE_FAILED: { @@ -388,9 +394,15 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment implements } break; case PrintJobInfo.STATE_BLOCKED: { - preference.setTitle(getString( - R.string.print_blocked_state_title_template, - printJob.getLabel())); + if (!printJob.isCancelling()) { + preference.setTitle(getString( + R.string.print_blocked_state_title_template, + printJob.getLabel())); + } else { + preference.setTitle(getString( + R.string.print_cancelling_state_title_template, + printJob.getLabel())); + } } break; }