From 46535343f2ef133bde774d7b10151bd2faca2416 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Fri, 27 May 2016 11:04:56 -0700 Subject: [PATCH] Use separate layout for un-selected page previews - Make remove icon more visible by removing the translucency in icon - Replace remove and check icon by vectors - unselected pages are now not faded out by being 50% translucent to the page shadow anymore, they are explcityly faded out by being 50% translucent to a defined background color - No need for our own animations as the recyclerview does all the animations for us Fixes: 28885729 Change-Id: I70d2db89c4124bf5ef528c65b5f79d189da43857 --- .../res/drawable-hdpi/ic_check_circle.png | Bin 1125 -> 0 bytes .../res/drawable-hdpi/ic_remove_circle.png | Bin 1075 -> 0 bytes .../res/drawable-mdpi/ic_check_circle.png | Bin 783 -> 0 bytes .../res/drawable-mdpi/ic_remove_circle.png | Bin 761 -> 0 bytes .../res/drawable-xhdpi/ic_check_circle.png | Bin 1342 -> 0 bytes .../res/drawable-xhdpi/ic_remove_circle.png | Bin 1343 -> 0 bytes .../res/drawable-xxhdpi/ic_check_circle.png | Bin 2131 -> 0 bytes .../res/drawable-xxhdpi/ic_remove_circle.png | Bin 1818 -> 0 bytes .../res/drawable-xxxhdpi/ic_check_circle.png | Bin 2345 -> 0 bytes .../res/drawable-xxxhdpi/ic_remove_circle.png | Bin 2073 -> 0 bytes .../res/drawable/ic_check_circle.xml | 25 ++++++++ .../res/drawable/ic_remove_circle.xml | 25 ++++++++ .../res/drawable/page_selector_background.xml | 36 ----------- .../PrintSpooler/res/layout/preview_page.xml | 11 ++-- .../res/layout/preview_page_selected.xml | 60 ++++++++++++++++++ packages/PrintSpooler/res/values/colors.xml | 2 + .../PrintSpooler/res/values/constants.xml | 3 - .../android/printspooler/ui/PageAdapter.java | 26 ++++++-- .../printspooler/widget/PreviewPageFrame.java | 39 ------------ 19 files changed, 139 insertions(+), 88 deletions(-) delete mode 100644 packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-hdpi/ic_remove_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xxhdpi/ic_check_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xxhdpi/ic_remove_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png delete mode 100644 packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png create mode 100644 packages/PrintSpooler/res/drawable/ic_check_circle.xml create mode 100644 packages/PrintSpooler/res/drawable/ic_remove_circle.xml delete mode 100644 packages/PrintSpooler/res/drawable/page_selector_background.xml create mode 100644 packages/PrintSpooler/res/layout/preview_page_selected.xml diff --git a/packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-hdpi/ic_check_circle.png deleted file mode 100644 index 4ad541771f9fbf1ee034b3e087e4351fc5717186..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1125 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 UvhZXoDDyISy85}Sb4q9e08ZVxI{*Lx diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-mdpi/ic_check_circle.png deleted file mode 100644 index f66065affeedc19ecda15fad0c7189859bc169a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 783 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&)Rw_dQ)4Lp+Wzop#nwBv7Dr|GZG)1SWb-&_)A_d8XA%l8moB-@vgQ5HN+vm`{v{np zc9=f1J;?28F3YlY$zzjx8-{g?O>Y(*yU%QUXJURHPeXe7x}7U{iY9y5RlnUSJ?}MB zzeNs9<>}_gg%Oi%*yj1$fBv_&=Hjxb{TVY;?&osY+$mmKa`D)du1zPthF&vBTO87( zS+@4qY4_FbBJXs|R8J;u%E{Sj7ZSenU4`(W*xge9AG{IU_5Fc=txa>QWZRN b6Vp?JQWH}u3s0tk5+;MEtDnm{r-UW|WrjFL diff --git a/packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-mdpi/ic_remove_circle.png deleted file mode 100644 index 7e044ac553a1347742595666570179d8efb287e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV z+ueoXKL{?^yL>WGgtNdSvKUBvfU(=jY&)RwCp}#pLp+YJo#yK&V<^ySFTE^q!U-WU znFjfVF^wu5oJAr#_}v>dI9g*E6+QYU+;n3ytUtFXp11Y*+K&vXk#~dNR;~XNqvyXM zK~uGwSIYD7?K9g24)KJ&U|{PwpfdaRi`of-`)0iEJS6jh?FQqv#?pk)1N{#2KX~tS zZ}1S}da&({?E`@u6Y5nMCZ|RI+kZf{;C0e+m4(cIB!2MlOugGPhi?UA)dACjiIa82 z5A0`*Z>ay|dMd4D+L7>|=WIRC9I$8n&D7tzW_QP;q;IVgb-jv@`m~N-M z!MVtF_wUao`jJ6zrcSnW{cgx$en3CLSL&L8>e<-fH@xd^mTrBme5-Gl$L@ceHR}6? z6CQFO|8~x65C5M9uMf>!7F?g|6#e{b_%j)y{hO}G|B`jd|9AV7yo=2)9Z8mk+rZdW zEpd$~Nl7e8wMs5Z1yT$~28JfO2IjhkrXhxgRwm|Frlvrym4U&f%fI)bXvob^$xN%n ztzmJWGZRpQB*=!~{Irtt#G+IN$CUh}R0Yr6#Prml)Wnp^!jq|>B*@_D>gTe~DWM4f Duu&*u diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_check_circle.png deleted file mode 100644 index d8ea4d291587364af12c308965960711eaa44875..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1342 zcmZ`(dpHw%82+uX43le}V>+}^%A7X$&2(79RwV;0*7@)Jah~t_zV~_G?|HxXzc1VKs5?U4P#pk(pi;+K#GER$1 zcJVp)VzR>Nn9p(TjH%Y#ih&+&679MW$1D5&w{-aSbx116?h%L(5JTNs_|lH1UA}(M zba*?--((+ryS~gE8O1)E>)7a+|!>an+U)eefozC#r@6(akq$K5C zGe7cX;tWx2uqrE-vJ6_x!__tVIHl0Kp`F{_>;%DE#$b_iIwx)E(QxYII8;mTPuTQc zE*=~ML=b809N4v?5~(%)otOpIfEH-dU01ab{qUgWmMJ>H>0or89Ns9)o^V9Bp$ZLN zJ34SomrU@k(R_v!#8Edd-$uV*e2$x94&(uE>DZ|vZQjm~D40kgZ&1)UJpzt?kYjU#A7?&Un zL}*cC_H@u3SDwM!|BUdKbuu{I0dw=^$I!nI8Qraiya;i5teW0#m8UP9tJs||1J@pJ zy7yB-fGx^qro3Tg^y#O~YCYi*g;OD4m))H;^xoc^$=f)cMETI+un(DXX=5vlVkdVT z=t#%%7~NK&qfqp8k<1slOpY)XYXFZfJxBJP9aLEb79xIb^(ts_gz^L4 z$@Ai1e)$LAi&piT?j1A68a?eCsu>@aB5__j#6B~AV(X#ay#hQxM1b&bU|1pp_s0SZ z#J6PRviJSIYhe#HM%8>FD<2x(s^~y0@u*D$TBKQ z|3g*4yII$1OX)Rc++&yVo8&^Z!1V<>QUAeR3vc)p9){mSLy)6gV%pcJFHK4;-xj zRD1xtnf1y7pSKDXTZ5^hfp-CG!mRjPOFNxAId*+M@oMqN#$8J%uD`_IkY5N3+>Xh_ zREzF}hvBzy{Buho^ND3~2u|A{-6}e9g|b%)f*t!_IXlMQh1{i>O`2Ts@slkq=pKFz z!=oE&tTiz2xxqX$!PALabhV1kCk3mdd)sP=9;b$`k=*~qXn8o(DMXcfHY>H@R|p5v zkm>xmb|h*D(RE%vr6}DxiB6lSOttMb>6O)*FQu|lA(oS_3(zZe80CvFi*@ylWzb@o zgy3kV5`YyJXJd)Ax5U}{;BW*RI|9y5NeNhNR%6=ie+=OfjL?vT|2M3@Bl;^1-+xQ+ pjtGfm)1sNcg%Lq#noz@OET$Ke#z=^gFu(mVKy^Jzt|J9q`UhoDN>cy; diff --git a/packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-xhdpi/ic_remove_circle.png deleted file mode 100644 index 622989c7d6f1e969e8d9cb38006a8333303fda85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1343 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 diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_check_circle.png deleted file mode 100644 index 1737f0a765aecdbac83c5394a9f5f8598c71036d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2345 zcmaJ@dpK0<9-fKZG88A9Bx4jwb2Y=vY(vbL+(wcl_c0d6m|4rr$e83ZoD%7-Q&KLm zlUrMeLXAUWciYKP(P>XpsnqLAD;8fqJf zg=0ZTCSdUt3I&TJU;K*YAe^);L ztG7rT1pJlnH;F~T=@5Vo0z_b{kfR=4ysah_M5PM>wipx!gJAMP7XuSPF(^s|AtarS zT+3o}xB`vs@Cm?TQGEm=FAy8ngYY+#!)>;1SZpkNx%_Zhc|X0$lU?NF@+!>`Ke|q_ZzuTh)l8v z-G%vGzAxCgZ{+eBOU8W{i&ZCs)lBw(CcSW^mXBupRkv#6tMUPXTJA!%u5J1ECt$F} zr9KRgV9Cg<$ngBFTg^Yxv?KTXls~6e#NQpO7?d9TC4XQ1Pso}!fpHRzQRMA0Lrz%L z5g2TySM2$N)DgE9QIv?278sTalthb~GbXq96&s(va`iPxwyNwJe$1Qb8jhORwYJ>t zv~zy^{hwjH^Y3MXHot;*zXs_K!AKh_bZX!Rqz#C`-~*yX2SELHolb+!u*QF67j`d^ z|6O4L8O=pDUYA?Tr^enPB(6i+7`=L%zRJh&MqN<%{8Mwk$45-tt>;!gS~3aWR0p5O z=uBz5WWUMg-??*AH%<1V{Eoc&+zR=%>t_^Z5WvFw=bX<5eO1MI@E5sf6iz{Xdti;W zQLt#O`NRwGH@SCmZfG@_p6yQPHZF;m8$g!il>_&mV5ad7m6f2b>-uP$ru!5iB?EXNB0fOVICAX;<(4NQL7Pt zHMx9tHMis-QRjqKIZ@^M9&uQ6}UM5~#{qrmh%gF3wFC@Y=%gJzSJy$G^bS4v@YEk<^c6go%Y!cWE= zO5Dt~l6RH#Ak5}5kSSR(>t26NYwL0k*JQHKlN}BnOS3AcKr85`BI|7Rp&cV>M&>N< zxtp*fr9Vfss7kcVe53mhGkWcBltMCTPo3zBP~OM5=5kBFaNxrGF5vB`z3FoIT%Q!x z(V|9Y9cbGtK)=x4?h?{CLL2cG7n55s73Fx(_qaPPomkVLw9K*3LLaF+vJzLN46i_Y zU2H}rGOo4t<@;$3*Ub*&25(jwDJ+aOZk_WCWm23R{DpGFx=i+?mz8>94ay(-W-x{j zez@aQ?WvDevRUTH3G={9tT{x1xv=C7;0;x?D&M(ED&JEkxUD-7HjQ*NeQ;>?_II3(GjZv~ZSL zR$-UA;e^8jE5gYwoG|;|kmuGZcTF%ItFIU9<3rkYBh3}DYrMCc#(o$XxPQCc&?+U= z&g`6N?7G*wDQQuisfPXH{*1x#%U2?nJx$A;%-;8(`uwu~36s^9rfY*#+nXIDhv56V z_UAUAGgT%(S&KriUKi@q$ZT@qEzD*%mU3_a%(Xp0SAyVg9SD`Asb@hS8WvQpMW_M%Ljoh&I zc^J2+z=a2UoBB4nwZGe!l!yHTs6Ca#>tEaA z-}*9Sap&5%yMq3BT7fD#`p{7pF72s(@BSb%c*(!(&$uRy*5_K2Yq9RM&B1dQba0aM zu7&v9e0CLoaEujx`tjlL>VQOpKYdC{UkIXK z=$2MJ_8e0B&&`v)@>$<5 zYICY~`9=%7jH6GoY<|3XWZ-OYgrC6Z_1u2x*`2R!XgBW}_>J-M5-f~YC5%qqK)?1p zT`d2w`C-aM_n;~A=!rm6^ULs}J*R6L7Vg3tcv5zy&Kz0}d)N~nXi}lPt@(NJ@d{ux IddA593&3~I7ytkO diff --git a/packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png b/packages/PrintSpooler/res/drawable-xxxhdpi/ic_remove_circle.png deleted file mode 100644 index e9c62529515242d059e9283b743897f323711714..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2073 zcmaJ?eN+=y7Jq<%lE$UVim(Dh_>j^jAu%B&29R%q1QAfef|ZaAkU}y;GC+bAqAj-4 zQi4Dc5$dTQxF7;$0Wk=+2oeQLMfA|J3L1;T?xKi7IJmnLD|Y`_cFwtT-+Slx``vrr zyKm-5RAd;@%H9e9K;&%?j>dhG(NwrMkKl+9DMe_+P?S;>X9K|XSE52uI*dWdaH>S+OPbMklOT!M zmlVh3d-2gAI8CxWR}RPIM#hSA(?x7C$=?s+Dml1-6vl**Qko%CaFo8J*SZ{hY+R<2 zpw|#A-Iw%RQUZPy6oklOh)H3RMP76o#9~uuOa_}q`v9VQ(Y8=&UQ{}pOrvoaEDp^Z zdh?L*XmW81CptLvO)PxoOG?8qltZQF2D=S(YLZP#hY!yH;k$jqEs5i%UIGfkk9}B zP^t7ST7gBwzvufug%z1C=^gjVAYqr;DA`= z&wsD}WykISo4#vLqr*S^s@%?86|mZK;4_bpM;xOcGfyohEG2l>-QBj|V;_0?dx}MX zYE9w5K)OWLbLTp|scE>fvgPGy`^+bQ2zYvNe!j{#^~ZsG>EUhd?L?cJm(Hg6-CKF8Kds+4t0-9FbHi%f8$(~L+ClQRei&7yXaU$(Zc$~27%=?eEN(U?q!%^tARhd6F? zFj%llo8mt)pCudY;=yM+7JLahvPiK`Y4wXz&?zot|G!N9iOm|RPauGK!(H8oyP@uD zMMI$#==$Z!j-+qCnfYjDi&cxx9#Be)tLC0uJhA^AP-;emx9ZpGAREw19}3szMwqm8 z6oAJ?6LW#qb(#+ft<0anyV+DYfB7{Sv>E9X5+nO_WH|V%%l91Kxx;! zK7KN`HZyTJ+x$w*jq-kWt!L50IV}O?RZn{d9|1iB_GO9Ci5PgKh88sx;@R}>@geqlv_P=+FTu%H&s&GGF8-D zS4mWdik~!y?7>&0Foc-~`k^ocW`Lx*>Bi2{(eqR3{*%K_&xRPqGbj80hyvnhf+Yi# z;n;EsxblOx`#KY3IA0qVn^P($GcI4MUpC z%tn(WNA_XDI046eX`zd|-Tv>}g2ZvzyQ9C3d@DY)R$ZUV4e3%blQ((NE_FHg z^nS6YBr`J8`xGUA+)CXoI9#HLBx>)G7dzc_XB;XtFC57{Z}&9Nd40>Lo%3n^%G;Y> z9Eiyq$Ua@Mj=$agtN;iSXj*8#wxjP< zVeHkb&$kvw3|zmPI&EXHQsoaEnmnL$)ZDi)>})E~b(fzbM|{_N#z7nLSJtzM_`&An zS3wz~R+kTTxq*2p>$-||w=F#Kr=Ye4MPtgy&1IE)GvH$n8s1T4?bKGOzAN5XJ;?1o zUY*KpuB<(E@!s0Fbi@7ZHf=+0(4zd_q}%?j33=T@x4O+6v%nGC?A!RSU5$ShAly7w bz1oljrmC!F7ls>L@ddyOi449Fm~`krv+_X$ diff --git a/packages/PrintSpooler/res/drawable/ic_check_circle.xml b/packages/PrintSpooler/res/drawable/ic_check_circle.xml new file mode 100644 index 0000000000000..0a07b1a4e91ea --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_check_circle.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/packages/PrintSpooler/res/drawable/ic_remove_circle.xml b/packages/PrintSpooler/res/drawable/ic_remove_circle.xml new file mode 100644 index 0000000000000..50ce2e88a68ad --- /dev/null +++ b/packages/PrintSpooler/res/drawable/ic_remove_circle.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/packages/PrintSpooler/res/drawable/page_selector_background.xml b/packages/PrintSpooler/res/drawable/page_selector_background.xml deleted file mode 100644 index 4d32328efdc90..0000000000000 --- a/packages/PrintSpooler/res/drawable/page_selector_background.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/PrintSpooler/res/layout/preview_page.xml b/packages/PrintSpooler/res/layout/preview_page.xml index edce28965001c..aafdd8fc035c1 100644 --- a/packages/PrintSpooler/res/layout/preview_page.xml +++ b/packages/PrintSpooler/res/layout/preview_page.xml @@ -20,12 +20,14 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/preview_page_margin" android:orientation="vertical" - android:background="?android:attr/colorForeground"> + android:background="@color/unselected_page_background_color" + android:elevation="@dimen/unselected_page_elevation" > + android:layout_height="fill_parent" + android:alpha="0.5"> + android:alpha="0.5"> + android:src="@drawable/ic_remove_circle"> diff --git a/packages/PrintSpooler/res/layout/preview_page_selected.xml b/packages/PrintSpooler/res/layout/preview_page_selected.xml new file mode 100644 index 0000000000000..77f4727434e69 --- /dev/null +++ b/packages/PrintSpooler/res/layout/preview_page_selected.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/PrintSpooler/res/values/colors.xml b/packages/PrintSpooler/res/values/colors.xml index 47e616ef40c77..9b4e94404c70d 100644 --- a/packages/PrintSpooler/res/values/colors.xml +++ b/packages/PrintSpooler/res/values/colors.xml @@ -22,6 +22,8 @@ #F2F1F2 + #C0C0C0 + #ffa3a3a3 diff --git a/packages/PrintSpooler/res/values/constants.xml b/packages/PrintSpooler/res/values/constants.xml index f6c52d3c04dc6..54a819f3ada75 100644 --- a/packages/PrintSpooler/res/values/constants.xml +++ b/packages/PrintSpooler/res/values/constants.xml @@ -39,9 +39,6 @@ 2 - 100% - 50% - 32dip 128dip diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java index c1a3f865bed46..54400b3b85405 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PageAdapter.java @@ -297,7 +297,14 @@ public final class PageAdapter extends Adapter { @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View page = mLayoutInflater.inflate(R.layout.preview_page, parent, false); + View page; + + if (viewType == 0) { + page = mLayoutInflater.inflate(R.layout.preview_page_selected, parent, false); + } else { + page = mLayoutInflater.inflate(R.layout.preview_page, parent, false); + } + return new MyViewHolder(page); } @@ -345,9 +352,9 @@ public final class PageAdapter extends Adapter { content.init(provider, mEmptyState, mErrorState, mMediaSize, mMinMargins); if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) >= 0) { - page.setSelected(true, false); + page.setSelected(true); } else { - page.setSelected(false, false); + page.setSelected(false); } page.setContentDescription(mContext.getString(R.string.page_description_template, @@ -364,6 +371,15 @@ public final class PageAdapter extends Adapter { return mSelectedPageCount; } + @Override + public int getItemViewType(int position) { + if (mConfirmedPagesInDocument.indexOfKey(computePageIndexInDocument(position)) >= 0) { + return 0; + } else { + return 1; + } + } + @Override public long getItemId(int position) { return computePageIndexInDocument(position); @@ -821,14 +837,14 @@ public final class PageAdapter extends Adapter { final int pageInDocument = computePageIndexInDocument(pageInAdapter); if (mConfirmedPagesInDocument.indexOfKey(pageInDocument) < 0) { mConfirmedPagesInDocument.put(pageInDocument, null); - page.setSelected(true, true); } else { if (mConfirmedPagesInDocument.size() <= 1) { return; } mConfirmedPagesInDocument.remove(pageInDocument); - page.setSelected(false, true); } + + notifyItemChanged(pageInAdapter); } } } diff --git a/packages/PrintSpooler/src/com/android/printspooler/widget/PreviewPageFrame.java b/packages/PrintSpooler/src/com/android/printspooler/widget/PreviewPageFrame.java index 6a6f1d3957da3..95bdb093aafe7 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/widget/PreviewPageFrame.java +++ b/packages/PrintSpooler/src/com/android/printspooler/widget/PreviewPageFrame.java @@ -22,29 +22,14 @@ import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.CompoundButton; import android.widget.LinearLayout; -import com.android.printspooler.R; /** * This class represents the frame of page in the print preview list * that contains the page and a footer. */ public final class PreviewPageFrame extends LinearLayout { - private final float mSelectedElevation; - private final float mNotSelectedElevation; - - private final float mSelectedPageAlpha; - private final float mNotSelectedAlpha; - public PreviewPageFrame(Context context, AttributeSet attrs) { super(context, attrs); - mSelectedElevation = mContext.getResources().getDimension( - R.dimen.selected_page_elevation); - mNotSelectedElevation = mContext.getResources().getDimension( - R.dimen.unselected_page_elevation); - mSelectedPageAlpha = mContext.getResources().getFraction( - R.fraction.page_selected_alpha, 1, 1); - mNotSelectedAlpha = mContext.getResources().getFraction( - R.fraction.page_unselected_alpha, 1, 1); } @Override @@ -65,28 +50,4 @@ public final class PreviewPageFrame extends LinearLayout { info.setCheckable(true); info.setChecked(isSelected()); } - - public void setSelected(boolean selected, boolean animate) { - if (isSelected() == selected) { - return; - } - setSelected(selected); - if (selected) { - if (animate) { - animate().translationZ(mSelectedElevation) - .alpha(mSelectedPageAlpha); - } else { - setTranslationZ(mSelectedElevation); - setAlpha(mSelectedPageAlpha); - } - } else { - if (animate) { - animate().translationZ(mNotSelectedElevation) - .alpha(mNotSelectedAlpha); - } else { - setTranslationZ(mNotSelectedElevation); - setAlpha(mNotSelectedAlpha); - } - } - } }