From 2f0ec7af06e206b1747b93efbd65d88189fc2df1 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Mon, 14 Oct 2013 13:45:31 -0700
Subject: [PATCH] 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
---
 .../res/drawable-hdpi/ic_menu_print.png          | Bin 0 -> 1133 bytes
 .../res/drawable-mdpi/ic_menu_print.png          | Bin 0 -> 930 bytes
 .../res/drawable-xhdpi/ic_menu_print.png         | Bin 0 -> 1387 bytes
 ...print_job_config_activity_content_editing.xml |   2 +-
 .../printspooler/SelectPrinterFragment.java      |   1 +
 5 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 packages/PrintSpooler/res/drawable-hdpi/ic_menu_print.png
 create mode 100644 packages/PrintSpooler/res/drawable-mdpi/ic_menu_print.png
 create mode 100644 packages/PrintSpooler/res/drawable-xhdpi/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 0000000000000000000000000000000000000000..09ab1a2bae1d4d105675346af26fa6ded7cc4542
GIT binary patch
literal 1133
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0
z-G$*l2rk&Wd@@jkv%n*=7)X17vD?XPI|c@3TTd6qkc@k8XYTI4>L7Bg{$$#HEv2Z=
zTRWOMqLv72JFa2L)@J>vzhR?z4$J>G*PJbvE(N&=%yAPC-6$j-8&V)&F7K(6=4WJ{
zlK<|>PVVo`1;xdaC%?BgE|x1!Y^r-W^{znM!oQ`fl;bAO(O7C#=6Sq8vXNm2j}NnF
zcg?m&^8<WS`W+0GT|6SNpHpX1`;L%3%0gd6VwvwrGJbj&#q>se&CK&=tZSxET&Klw
zz})@PB!-ReT{7a6l@{dhSjVVeZo-?sdmYoZvlqiex_WEXk7}-2qB_sxgwrf`ncT*T
zi4&&YsczqK<D{<YWM%)0XKNSqOb;)ZoN|}@faQaZuLZa7iK|?Dp8r7k1EcNUOK;Xp
zIi#&n&$NSej+^_+j62)6wP=31^@B@?`F^gT5tG@^>H~?Jrreu){d33KV)+P$e@y)@
zEkRlzi@yG=eW0_!t9)y{piRO(f%^{PWrhU|KUi$GO!YL{%`wMOJg0Wz^ePReIL7l0
z@dtW#?&H&8eBQc$Zs+uj?bqbR?LLT9FzsQGW3E4O?U2c>i!aYQ{ZROOu2OS(c;olB
z<2)aPe=wbiis3(LT)k54(*?PC?0%A)q7TRv%vp0#vMF2hqM6X)mu4S?ez3<d`Z3M^
z?bz_;$nl2VF9bg}GVb0oy_D5t>w~>_c8c`6?l;#uu>9Ym?cB$L4*7E5SX8&tu$8ZO
zYCxz%6JO!!1JNb3`ek!Hl6JA&F+5iwcUH}fAz{IkA|YTL&fgr!S<1R3b(<!Kw(afZ
z4O{ZUy)0dq81PJ<(|e04=}VK0spzg#cRqH!c9vn@#A4We@B5Ul4IIsVEIK^`8!~n<
zRWRNZ*vGbS;?`U<l~;ER=I6fi%V#{V+2?iX-M<O%8%@jYXD4%nZ8u|&N$-(;+%>_=
z!YO|}zd`Kv73ob)Yo{o!cM<W|-udjg)$YOvldoDWej~=|vAH}UcecpVk~JSP^mTTs
zMOv(zz<%Q9hPmq79&LINrrvYxg`OT$TKUH-8Wk^uDmlOF-0NuI*ufREI?-8X<K?Lh
zEe}_Qt>)Q~kS}Z1yJU4kX0eCl-4uHT+l|4guYSqj<l2><``LaIulVsEWrv<zCVnZk
zz0ymhUsrdhH*tQm`Ny1p_H*oduclOBj#4dgjVMV;EJ?LWE=mPb3`Pcq#=3?Ex`rkp
zhDKIEWMrgkU~Xk#aQW>GTNDks`6-!cmAEx5+K|u))F276Aviy+q&%@GmBBG3KPgqg
dGdD3kH7GSPrLyp3Dk$4Cc)I$ztaD0e0suj{(ZT=#

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..637d94ecfb0eb1e8d7ca3b4dd6a8a76c6f93f328
GIT binary patch
literal 930
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@(mMV>B>ArXhqPPgv6;vmpwFU@bv&8?!K
zqT=CE(IVU6Vac*Y+VOzs4hBO;_6JNd4a^N!JQOA>EaaUaAh=$1_h#$YW{%<gr)}%j
zH|w6<WO_ODe|*06Lbo2nhlYt#nha~U3eTJ!kYyVpID_#er=iS-tS*OZ3#N2EQhp%!
zA)iH%eGdCQ#`ROr#<4WTFz7LNPh{D4)NOHzpvANgYu$t*I(sj&90)Ji(dMB)SC6T<
zMxuM7;0-b9w=9eHU7!0=^ac~3o6rp*X%4?t%E@b0I}cn}oL!ZnF^4NmL7;92n+?ml
z?&F0n$2>mVV7%Y3{lNEznStM)$3BqUmm4N*6|do*$IRa_{Xn|HS&ibY&F{b4ADGE`
zFn!8f3-KP=2bKi_T(9{GMB{U2Ce=*hX8g~(N8muL0{c1-lWS9JCuV+<t*#GqC~v%f
zKwXiwfb$pcqK%W7ygz=i`yf33zp^K@Gv^M*bmm5<1M>pP4lC|^#wKjx{y*`_k?IeY
z=dadJHTkYOfkD1;{|`RRsB=$$%-ZF8vnfhzS1sp~1JZvYeAjN>`f@_x>xS7s&YjxL
zlg;ECtzRLK<}B5Fb;gRtR_;mFqCGyE=Wf)np4RNnug&jdxOj7etEuAhLZ-&r2kckF
z*E88qi@u)OzU0TM`@s`Snl`WJ+{2!;WCzQ<N7dykJHC24?$B@GKcHQCZQ^N0qsZM;
z!zLzi<p{66V9fe3XOTnyt1p|{`X}tVwzE-3B-tlgTJF@%-XybQDihC^vRvTeQh4(*
z`GMiza#uwwzni*iwn`t_{p>)~r>#{l7IC@m$*`WXRipWSoHyrd38vx)-YK6;Jg;wm
zIOToI^3Sh-*xQ>OQL+z{S_4dmswJ)wB`Jv|saDBFsX&Us$iUE8*U&)M&?Lmr$O?#z
zjC2jmtqcq<zrA6Lq9HdwB{QuOw}wR<5*mRTBtbR==ckpFCl;kLIHu$$r7C#lCZ?wb
Xr6#6S7M@H6<rM}`S3j3^P6<r_GsbEb

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..4d4b3cc1a11904617f78f91c3af694c879f92ea5
GIT binary patch
literal 1387
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&)QJ)}AhoAr-gY&i2l}5+HKCesbqFuC6AH
zFacIaSHav1Q+EhV-zC8Em#Ilx{FQpaTlRn>OJCfZyQ4sJiiTZS(+cU=%#JnX%O>xz
z_+Ikv$i}lO=6gHm+P9S5dh%?}f7|bS-pNWN_lWjhTfy%V=pu96CGbh~H^vn{g);qL
zVje^n+~@GNxy^KIpQynL#+OBc0t}oR_$~Nr4$oIrJz(`f?Zcr-YlE0Xgb#!z2-Q!!
zz-%TJ$+eJ&QS$=pGtG>;K8_dDD(fYg9R4)K*#-Q%t8K^C!}&qCAs<3c;cd26`S?MU
zRmdx)F_n{}@v9rd{LTx%jH;f@+UfK3x|76xCK<N6=d#P0mUyUHG1qKJVLlNmsi(Cg
zFlKVENWJ9!6%rFF4VC^WDHz{Y78f@?(!dvK#Ky5<%68vO;|;<$8rPV|Kbt46`9ZXT
zc@LXiTInXwh=8<?PuY#ZC#>%0{JSoaec{7D!H@jk8|EMOI8o()`(P|X8DsGQ{`*p*
zN7x>yY+&DUPQd+U8)G_qP<*`0nSZ-?S|)7xlznRI49+`DZ`kG~ExLB)ipb{8o9k1X
zGz)HN{68!Z^4&E5^u0y-|9<VvExDOkBHfXaoBb`g_;TculNYy`R5HzctG9tG@}6z?
z6g>l08}@w(YaD7DgbG+Zb!ybi7b}^bx@Ug9`~gD&+l>^F@V{z}nGe?fJ8LH1klVI)
znTidk(P!fWvJZ@tSd9<l{t{c@8PgE)v*}!8sdI)zme-14)iCCb7hP+^81^vToB98C
zi?5Qm3TxCit8k-PEY|54SB2<WxU5l@{B)*i9^(^jsjM!sN9+5Pe=~pna{6(y$L)QG
zCv^S|SGr=drRUP^#?uFsQx>P`Kf3TdLTQ%iTn5#J$sRZQX8h4QVl?f@e}@L&rhoTT
z)8#(z7g*4xU8G(ZDlj1+RxWY*F24X)#_S0<R`1-w{USp4$i}Oa7<%{eH>RhYIydRU
zMm`32!SnB1Vy=q`D8$Y<-gi87jq{`3#vvP7)OZB-es@}hJuGH8?dc$OyfBGR$5PSZ
zc-Nv6JBxFp&c2t?p4ae3$iw)0&<gLbGu*E&tO6#Si8faL-ah8;uNx*TRd>#AG5Eb;
z?S<+ki3ZzGG~CLKZQe4c>c{35k<6wVrn-$4=Gv}{PE`M%cj4Cs*1V?yZqAn!9|&Da
z__Eb{j>7Ix^9J=N+<RA+`b+Ui8l3ljo$^m2^2?e-9t$^lh-9SJU1Mxb)hddzG4MQT
zQqcNO=mOi**awVPQ<~Hpioe{Bu}%5?I!fkvf9SSAwslIvZzK|9%chsE@mm?FrRK2s
zaGlDX6`?z%cDKKIZ)rRE$t|X;1CA-*mvX&WsFA)RiStbOl0Ao3eqP(uVCC9=ic?}~
z-U_Cr_hY|l8?Qe5boHv7+26&t?NVaVc&y*JI%NN|&o4fxDc{~C@PXGdCqP|?n~`h&
zeG$oJ6~X6BdJK<Am>!ZpB`a4UYkDUeSe~esxJHzuB$lLFB^RXvDF!10Lt|Y-16@Ot
z5JMv?ATl!2H88g_Fu45ohAoPQ-29Zxv`X9>7Hvpq1Zt23*$|wcR#Ki=l*-_klAn~S
e;F+74o*I;zm{M7IG8I(lF?hQAxvX<aXaWEkfJKY|

literal 0
HcmV?d00001

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 83019b9ef79a3..02740a308fa55 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
diff --git a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
index d68893236ca84..be94ba4c94184 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
@@ -93,6 +93,7 @@ public final class SelectPrinterFragment extends ListFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        getActivity().getActionBar().setIcon(R.drawable.ic_menu_print);
     }
 
     @Override