summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler/res
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2013-10-14 17:19:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-14 17:19:36 -0700
commitf62e262932daaea8b5eda3893a56e2fdbb17ea0a (patch)
tree9bca482ac67a228f9e0e2f3e5822d60bcdc7bd93 /packages/PrintSpooler/res
parent796629422f3023c1cc3c8d970f5b66c1b34599d2 (diff)
parentfe3b58fbed7a02d3e9f559ed2f814b42934dc784 (diff)
downloadframeworks_base-f62e262932daaea8b5eda3893a56e2fdbb17ea0a.zip
frameworks_base-f62e262932daaea8b5eda3893a56e2fdbb17ea0a.tar.gz
frameworks_base-f62e262932daaea8b5eda3893a56e2fdbb17ea0a.tar.bz2
am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev
* commit 'fe3b58fbed7a02d3e9f559ed2f814b42934dc784': Update the print spooler action bar icon.
Diffstat (limited to 'packages/PrintSpooler/res')
-rw-r--r--packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.pngbin0 -> 1133 bytes
-rw-r--r--packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.pngbin0 -> 930 bytes
-rw-r--r--packages/PrintSpooler/res/drawable-xhdpi/ic_menu_print.pngbin0 -> 1387 bytes
-rw-r--r--packages/PrintSpooler/res/layout/print_job_config_activity_content_editing.xml2
4 files changed, 1 insertions, 1 deletions
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
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
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
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