From 3887dd7090addccaf95620e29b744a540f9320b1 Mon Sep 17 00:00:00 2001 From: Christophe Boucaut Date: Fri, 31 Oct 2014 15:44:16 +0100 Subject: [PATCH] Mise en place de la camera qui change en fonction de l'orientation + une image par dessus. --- AndroidManifest.xml | 3 +- res/drawable-hdpi/labs.png | Bin 0 -> 3047 bytes res/drawable-mdpi/labs.png | Bin 0 -> 3047 bytes res/drawable-xhdpi/labs.png | Bin 0 -> 3047 bytes res/drawable-xxhdpi/labs.png | Bin 0 -> 3047 bytes res/layout/activity_camera_view.xml | 27 +++++--- res/values/strings.xml | 3 + .../geneanet/testcustomcamera/CameraView.java | 61 ++++++++++++------ .../testcustomcamera/utils/CustomCamera.java | 17 +++++ 9 files changed, 81 insertions(+), 30 deletions(-) create mode 100644 res/drawable-hdpi/labs.png create mode 100644 res/drawable-mdpi/labs.png create mode 100644 res/drawable-xhdpi/labs.png create mode 100644 res/drawable-xxhdpi/labs.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ee77a2e..657aba1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -24,7 +24,8 @@ + android:label="@string/title_activity_camera_view" + android:screenOrientation="fullSensor"> diff --git a/res/drawable-hdpi/labs.png b/res/drawable-hdpi/labs.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fada363b643552b8488d323145b8d10e9dcf7b GIT binary patch literal 3047 zcmV;n}Q0UrYbMLE&U|Mk!H8fOpg{3I1RXR4C{RtKK!Iu+1qxKtC{Uo9Mu7s=G>ZRcO|$rLF5}tM znq0;+79V{Hh~m$@PNzL;RmwV-@ht68D;hf#e_~DBl8COak$IAFq{x$uyS_%YB@xl^ zp+NI#6ev(lqd+m2HO=bli%&{gwR-i+;NYFRcQ-aQ&D2vSlU3cli<~z-empulI;-&> zCUbpc6AUx(u2Dyypg;}PiY?%ud*(^UJ@X4k`HZr`=5ySw`p`TyZq865oY zF^Nx1)H3q7@7#GMO)Hb>Np%W@zm@Cg=;+SfyDcp&t`!xPm6U{qh9)H^H@CE??aX8{ zD=I6I^P43lY&LsV`%f5*C5sp5ojdm`S3>D4B`IkIjrRLpa;5!gvtzMXIayhY7A<;3 z{{J;76biNV#n-Q!nVJ2re)ID4)i&X@8DIEwPwN=>VvrY7jB)(SiH6p~pL=4Q7HCi6 z+PB|2J2~y$vj-`z4hbFF@O!-tKHjn%S6IzOzhKcAm}<*Tod;s+mnv~$M} z7Z(>*@4+D*k> zkq#RoA|5w1h+z20;lpvUu`r)MJUIByJMTPYFs9o1x}e~2N{R@Ezb`M3ij3s2*)Iix zg9i>|o;f3e;m_#wZCkercswBlZHS2YsisB*!)wFB?)> zAq1^ox32W&O%V*YwzT+Csl$VVg;%Zw1OyDQSRxosOHIwn%$&)7RAgjXNr?!C%SuYt zg@=n^_$h-C78jIv z#nV6WU*7pw#a5$W>&`C#OrfwmtR?XAb$6zp_Yt|^UcB+pL4u{jx(V1^;&1SRv2L^aN z9323rq(_HAU`i} zWndrxV41u7uR}wc%+sf>|&;X?qxy}CL-Utb&!HxsuNettSSIvSWXHZ?6>y41$n8UV0n z_3Dm}4p=DE;2lArzdzByKu=H4*VnhLt!-9?OpEg@xd&e&O?%Xu;I)`=rL(7kx#;>@ z0D!I~(UwHqhS|q$n1P`Fy@w3os1FCL|!w zsqyjgK!1PrsXvcLB9SJY8X0l9T;zP-ym^y*2neB(ych7I@X>OR=A zMFTgIu`vKZ0~0=JKmw@2JCeX4Cx%4g(9qDV3Yiw?Su}l?(Fp+f)XiSs zR%*P;u4n6QtfB6k--aWV$OpyKv}M|8+TG2qqOuaX+YsEXuEyi>PL7WH`uaD&`)+FI zn%Y`b3udOKX{o8R?w?FdOdtrFjOh#y2jm`u__IBi4B9VwC z5~W@>Kp+q(FCWRs$jr=4RUt}QtHxPV?!n^2CmLFlycZM4!SJ~!(EWbn5If^lc9WVQ z=$@vzpKI>a@`oRrHg06~^_@&l=WsYLMWV{8s?6+ca|(q*p;%d2-L0-hme?byslt~p zu~;lD6e4?SEDk4tVE_P?N-eu}OQBH6WU`#x+>VY8wT^t=e)~>Eg-9ftn3yOlFMs>3 zx72pCva&KaH%H#Cl$MwOEhlHHF9epBmgeT>2)EA8&RZufHDv(9zM6 zm7P5+b6s6sFHg_EpFi(Qr6OyyW^QVkD7`b9n+FC50RZKh7`z`>$%fn-)C2a+b#_a9g zwtc%op;)qH$$OhN%|t2n=+V?;$Ij*D+1l77B_sdK3PiJI&edUTSfslIS zh@qjOmYQB*XZM!3_omI8O-xL-Z`;<=(z1_EKR~BX>!#)GR9i6^jD@-RyD>3XEY^ff zjy-f}s6_wLn(y#I<7iOI>?nVB!^6Bzq2zh{(#wm=htN` z=1yNLiq*aTcH!*bz@3?bHO}*Mn>#}nTB89)F-JAc7fVTcx+d%GofV4F`%DevDO5XR z;6gCmhlUcxoX)4ef8PJ`-A9mgTuUoPy7-HK^+wle6mxoyh-B4TT5)}itmW546e#{k pO`|~ZX9W5`7Zj+bQJ|RH_$QKDqt12N&|&}p002ovPDHLkV1nA}<~slY literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/labs.png b/res/drawable-mdpi/labs.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fada363b643552b8488d323145b8d10e9dcf7b GIT binary patch literal 3047 zcmV;n}Q0UrYbMLE&U|Mk!H8fOpg{3I1RXR4C{RtKK!Iu+1qxKtC{Uo9Mu7s=G>ZRcO|$rLF5}tM znq0;+79V{Hh~m$@PNzL;RmwV-@ht68D;hf#e_~DBl8COak$IAFq{x$uyS_%YB@xl^ zp+NI#6ev(lqd+m2HO=bli%&{gwR-i+;NYFRcQ-aQ&D2vSlU3cli<~z-empulI;-&> zCUbpc6AUx(u2Dyypg;}PiY?%ud*(^UJ@X4k`HZr`=5ySw`p`TyZq865oY zF^Nx1)H3q7@7#GMO)Hb>Np%W@zm@Cg=;+SfyDcp&t`!xPm6U{qh9)H^H@CE??aX8{ zD=I6I^P43lY&LsV`%f5*C5sp5ojdm`S3>D4B`IkIjrRLpa;5!gvtzMXIayhY7A<;3 z{{J;76biNV#n-Q!nVJ2re)ID4)i&X@8DIEwPwN=>VvrY7jB)(SiH6p~pL=4Q7HCi6 z+PB|2J2~y$vj-`z4hbFF@O!-tKHjn%S6IzOzhKcAm}<*Tod;s+mnv~$M} z7Z(>*@4+D*k> zkq#RoA|5w1h+z20;lpvUu`r)MJUIByJMTPYFs9o1x}e~2N{R@Ezb`M3ij3s2*)Iix zg9i>|o;f3e;m_#wZCkercswBlZHS2YsisB*!)wFB?)> zAq1^ox32W&O%V*YwzT+Csl$VVg;%Zw1OyDQSRxosOHIwn%$&)7RAgjXNr?!C%SuYt zg@=n^_$h-C78jIv z#nV6WU*7pw#a5$W>&`C#OrfwmtR?XAb$6zp_Yt|^UcB+pL4u{jx(V1^;&1SRv2L^aN z9323rq(_HAU`i} zWndrxV41u7uR}wc%+sf>|&;X?qxy}CL-Utb&!HxsuNettSSIvSWXHZ?6>y41$n8UV0n z_3Dm}4p=DE;2lArzdzByKu=H4*VnhLt!-9?OpEg@xd&e&O?%Xu;I)`=rL(7kx#;>@ z0D!I~(UwHqhS|q$n1P`Fy@w3os1FCL|!w zsqyjgK!1PrsXvcLB9SJY8X0l9T;zP-ym^y*2neB(ych7I@X>OR=A zMFTgIu`vKZ0~0=JKmw@2JCeX4Cx%4g(9qDV3Yiw?Su}l?(Fp+f)XiSs zR%*P;u4n6QtfB6k--aWV$OpyKv}M|8+TG2qqOuaX+YsEXuEyi>PL7WH`uaD&`)+FI zn%Y`b3udOKX{o8R?w?FdOdtrFjOh#y2jm`u__IBi4B9VwC z5~W@>Kp+q(FCWRs$jr=4RUt}QtHxPV?!n^2CmLFlycZM4!SJ~!(EWbn5If^lc9WVQ z=$@vzpKI>a@`oRrHg06~^_@&l=WsYLMWV{8s?6+ca|(q*p;%d2-L0-hme?byslt~p zu~;lD6e4?SEDk4tVE_P?N-eu}OQBH6WU`#x+>VY8wT^t=e)~>Eg-9ftn3yOlFMs>3 zx72pCva&KaH%H#Cl$MwOEhlHHF9epBmgeT>2)EA8&RZufHDv(9zM6 zm7P5+b6s6sFHg_EpFi(Qr6OyyW^QVkD7`b9n+FC50RZKh7`z`>$%fn-)C2a+b#_a9g zwtc%op;)qH$$OhN%|t2n=+V?;$Ij*D+1l77B_sdK3PiJI&edUTSfslIS zh@qjOmYQB*XZM!3_omI8O-xL-Z`;<=(z1_EKR~BX>!#)GR9i6^jD@-RyD>3XEY^ff zjy-f}s6_wLn(y#I<7iOI>?nVB!^6Bzq2zh{(#wm=htN` z=1yNLiq*aTcH!*bz@3?bHO}*Mn>#}nTB89)F-JAc7fVTcx+d%GofV4F`%DevDO5XR z;6gCmhlUcxoX)4ef8PJ`-A9mgTuUoPy7-HK^+wle6mxoyh-B4TT5)}itmW546e#{k pO`|~ZX9W5`7Zj+bQJ|RH_$QKDqt12N&|&}p002ovPDHLkV1nA}<~slY literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/labs.png b/res/drawable-xhdpi/labs.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fada363b643552b8488d323145b8d10e9dcf7b GIT binary patch literal 3047 zcmV;n}Q0UrYbMLE&U|Mk!H8fOpg{3I1RXR4C{RtKK!Iu+1qxKtC{Uo9Mu7s=G>ZRcO|$rLF5}tM znq0;+79V{Hh~m$@PNzL;RmwV-@ht68D;hf#e_~DBl8COak$IAFq{x$uyS_%YB@xl^ zp+NI#6ev(lqd+m2HO=bli%&{gwR-i+;NYFRcQ-aQ&D2vSlU3cli<~z-empulI;-&> zCUbpc6AUx(u2Dyypg;}PiY?%ud*(^UJ@X4k`HZr`=5ySw`p`TyZq865oY zF^Nx1)H3q7@7#GMO)Hb>Np%W@zm@Cg=;+SfyDcp&t`!xPm6U{qh9)H^H@CE??aX8{ zD=I6I^P43lY&LsV`%f5*C5sp5ojdm`S3>D4B`IkIjrRLpa;5!gvtzMXIayhY7A<;3 z{{J;76biNV#n-Q!nVJ2re)ID4)i&X@8DIEwPwN=>VvrY7jB)(SiH6p~pL=4Q7HCi6 z+PB|2J2~y$vj-`z4hbFF@O!-tKHjn%S6IzOzhKcAm}<*Tod;s+mnv~$M} z7Z(>*@4+D*k> zkq#RoA|5w1h+z20;lpvUu`r)MJUIByJMTPYFs9o1x}e~2N{R@Ezb`M3ij3s2*)Iix zg9i>|o;f3e;m_#wZCkercswBlZHS2YsisB*!)wFB?)> zAq1^ox32W&O%V*YwzT+Csl$VVg;%Zw1OyDQSRxosOHIwn%$&)7RAgjXNr?!C%SuYt zg@=n^_$h-C78jIv z#nV6WU*7pw#a5$W>&`C#OrfwmtR?XAb$6zp_Yt|^UcB+pL4u{jx(V1^;&1SRv2L^aN z9323rq(_HAU`i} zWndrxV41u7uR}wc%+sf>|&;X?qxy}CL-Utb&!HxsuNettSSIvSWXHZ?6>y41$n8UV0n z_3Dm}4p=DE;2lArzdzByKu=H4*VnhLt!-9?OpEg@xd&e&O?%Xu;I)`=rL(7kx#;>@ z0D!I~(UwHqhS|q$n1P`Fy@w3os1FCL|!w zsqyjgK!1PrsXvcLB9SJY8X0l9T;zP-ym^y*2neB(ych7I@X>OR=A zMFTgIu`vKZ0~0=JKmw@2JCeX4Cx%4g(9qDV3Yiw?Su}l?(Fp+f)XiSs zR%*P;u4n6QtfB6k--aWV$OpyKv}M|8+TG2qqOuaX+YsEXuEyi>PL7WH`uaD&`)+FI zn%Y`b3udOKX{o8R?w?FdOdtrFjOh#y2jm`u__IBi4B9VwC z5~W@>Kp+q(FCWRs$jr=4RUt}QtHxPV?!n^2CmLFlycZM4!SJ~!(EWbn5If^lc9WVQ z=$@vzpKI>a@`oRrHg06~^_@&l=WsYLMWV{8s?6+ca|(q*p;%d2-L0-hme?byslt~p zu~;lD6e4?SEDk4tVE_P?N-eu}OQBH6WU`#x+>VY8wT^t=e)~>Eg-9ftn3yOlFMs>3 zx72pCva&KaH%H#Cl$MwOEhlHHF9epBmgeT>2)EA8&RZufHDv(9zM6 zm7P5+b6s6sFHg_EpFi(Qr6OyyW^QVkD7`b9n+FC50RZKh7`z`>$%fn-)C2a+b#_a9g zwtc%op;)qH$$OhN%|t2n=+V?;$Ij*D+1l77B_sdK3PiJI&edUTSfslIS zh@qjOmYQB*XZM!3_omI8O-xL-Z`;<=(z1_EKR~BX>!#)GR9i6^jD@-RyD>3XEY^ff zjy-f}s6_wLn(y#I<7iOI>?nVB!^6Bzq2zh{(#wm=htN` z=1yNLiq*aTcH!*bz@3?bHO}*Mn>#}nTB89)F-JAc7fVTcx+d%GofV4F`%DevDO5XR z;6gCmhlUcxoX)4ef8PJ`-A9mgTuUoPy7-HK^+wle6mxoyh-B4TT5)}itmW546e#{k pO`|~ZX9W5`7Zj+bQJ|RH_$QKDqt12N&|&}p002ovPDHLkV1nA}<~slY literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/labs.png b/res/drawable-xxhdpi/labs.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fada363b643552b8488d323145b8d10e9dcf7b GIT binary patch literal 3047 zcmV;n}Q0UrYbMLE&U|Mk!H8fOpg{3I1RXR4C{RtKK!Iu+1qxKtC{Uo9Mu7s=G>ZRcO|$rLF5}tM znq0;+79V{Hh~m$@PNzL;RmwV-@ht68D;hf#e_~DBl8COak$IAFq{x$uyS_%YB@xl^ zp+NI#6ev(lqd+m2HO=bli%&{gwR-i+;NYFRcQ-aQ&D2vSlU3cli<~z-empulI;-&> zCUbpc6AUx(u2Dyypg;}PiY?%ud*(^UJ@X4k`HZr`=5ySw`p`TyZq865oY zF^Nx1)H3q7@7#GMO)Hb>Np%W@zm@Cg=;+SfyDcp&t`!xPm6U{qh9)H^H@CE??aX8{ zD=I6I^P43lY&LsV`%f5*C5sp5ojdm`S3>D4B`IkIjrRLpa;5!gvtzMXIayhY7A<;3 z{{J;76biNV#n-Q!nVJ2re)ID4)i&X@8DIEwPwN=>VvrY7jB)(SiH6p~pL=4Q7HCi6 z+PB|2J2~y$vj-`z4hbFF@O!-tKHjn%S6IzOzhKcAm}<*Tod;s+mnv~$M} z7Z(>*@4+D*k> zkq#RoA|5w1h+z20;lpvUu`r)MJUIByJMTPYFs9o1x}e~2N{R@Ezb`M3ij3s2*)Iix zg9i>|o;f3e;m_#wZCkercswBlZHS2YsisB*!)wFB?)> zAq1^ox32W&O%V*YwzT+Csl$VVg;%Zw1OyDQSRxosOHIwn%$&)7RAgjXNr?!C%SuYt zg@=n^_$h-C78jIv z#nV6WU*7pw#a5$W>&`C#OrfwmtR?XAb$6zp_Yt|^UcB+pL4u{jx(V1^;&1SRv2L^aN z9323rq(_HAU`i} zWndrxV41u7uR}wc%+sf>|&;X?qxy}CL-Utb&!HxsuNettSSIvSWXHZ?6>y41$n8UV0n z_3Dm}4p=DE;2lArzdzByKu=H4*VnhLt!-9?OpEg@xd&e&O?%Xu;I)`=rL(7kx#;>@ z0D!I~(UwHqhS|q$n1P`Fy@w3os1FCL|!w zsqyjgK!1PrsXvcLB9SJY8X0l9T;zP-ym^y*2neB(ych7I@X>OR=A zMFTgIu`vKZ0~0=JKmw@2JCeX4Cx%4g(9qDV3Yiw?Su}l?(Fp+f)XiSs zR%*P;u4n6QtfB6k--aWV$OpyKv}M|8+TG2qqOuaX+YsEXuEyi>PL7WH`uaD&`)+FI zn%Y`b3udOKX{o8R?w?FdOdtrFjOh#y2jm`u__IBi4B9VwC z5~W@>Kp+q(FCWRs$jr=4RUt}QtHxPV?!n^2CmLFlycZM4!SJ~!(EWbn5If^lc9WVQ z=$@vzpKI>a@`oRrHg06~^_@&l=WsYLMWV{8s?6+ca|(q*p;%d2-L0-hme?byslt~p zu~;lD6e4?SEDk4tVE_P?N-eu}OQBH6WU`#x+>VY8wT^t=e)~>Eg-9ftn3yOlFMs>3 zx72pCva&KaH%H#Cl$MwOEhlHHF9epBmgeT>2)EA8&RZufHDv(9zM6 zm7P5+b6s6sFHg_EpFi(Qr6OyyW^QVkD7`b9n+FC50RZKh7`z`>$%fn-)C2a+b#_a9g zwtc%op;)qH$$OhN%|t2n=+V?;$Ij*D+1l77B_sdK3PiJI&edUTSfslIS zh@qjOmYQB*XZM!3_omI8O-xL-Z`;<=(z1_EKR~BX>!#)GR9i6^jD@-RyD>3XEY^ff zjy-f}s6_wLn(y#I<7iOI>?nVB!^6Bzq2zh{(#wm=htN` z=1yNLiq*aTcH!*bz@3?bHO}*Mn>#}nTB89)F-JAc7fVTcx+d%GofV4F`%DevDO5XR z;6gCmhlUcxoX)4ef8PJ`-A9mgTuUoPy7-HK^+wle6mxoyh-B4TT5)}itmW546e#{k pO`|~ZX9W5`7Zj+bQJ|RH_$QKDqt12N&|&}p002ovPDHLkV1nA}<~slY literal 0 HcmV?d00001 diff --git a/res/layout/activity_camera_view.xml b/res/layout/activity_camera_view.xml index aaf3608..acd80d5 100644 --- a/res/layout/activity_camera_view.xml +++ b/res/layout/activity_camera_view.xml @@ -7,16 +7,23 @@ + android:layout_height="fill_parent"> + -