commit 2f0ec7af06e206b1747b93efbd65d88189fc2df1
author Svetoslav Ganov <svetoslavganov@google.com> Mon Oct 14 13:45:31 2013 -0700
committer Svetoslav <svetoslavganov@google.com> Mon Oct 14 13:49:17 2013 -0700
tree 6edb6220bbcea5b2a2f194c145ac45bf57e63f6d
parent 9d843e09caa8c32a3fec22bb66cba8e6d4dfa5b1

Update the print spooler action bar icon.

1. Updated the print spooler icon shown in the action bar
   when searching for printers in the all printers activity.

2. If the current printer's capabilities are not immediately
   available the page count label in the dialog contained the
   argument placeholders.

bug:10983508

Change-Id: Id4f78d6cc31647f043f8e3044ab54f30584d1ebe

packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png

diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
new file mode 100644
index 0000000..09ab1a2
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
Binary files differ

packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png

diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
new file mode 100644
index 0000000..637d94e
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
Binary files differ

packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png

diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
new file mode 100644
index 0000000..4d4b3cc
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.png
Binary files differ

packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml

diff --git a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
index 83019b9..02740a3 100644
--- a/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
+++ b/packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml
@@ -107,7 +107,7 @@
                     android:layout_marginStart="36dip"
                     android:textAppearance="@style/PrintOptionTitleTextAppearance"
                     android:labelFor="@+id/range_options_spinner"
-                    android:text="@string/label_pages">
+                    android:text="@string/page_count_unknown">
                 </TextView>
 
                 <Spinner

packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
index d688932..be94ba4 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
@@ -93,6 +93,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        getActivity().getActionBar().setIcon(R.drawable.ic_menu_print);
     }
 
     @Override