From de03dadc3c594b4ee8ab33aabb1c4528112ba22c Mon Sep 17 00:00:00 2001 From: Remek Zajac Date: Fri, 7 Aug 2020 13:10:28 +0200 Subject: [PATCH] Allow custom AndroidManifest.xml and icons --- android.pri | 19 +++- custom-example/android/AndroidManifest.xml | 84 ++++++++++++++++++ .../android/res/drawable-ldpi/icon.png | Bin 0 -> 20526 bytes .../qgroundcontrol/CustomQGCActivity.java | 5 ++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 custom-example/android/AndroidManifest.xml create mode 100644 custom-example/android/res/drawable-ldpi/icon.png create mode 100644 custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java diff --git a/android.pri b/android.pri index 4155947431..b282d988ff 100644 --- a/android.pri +++ b/android.pri @@ -1,9 +1,26 @@ include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri) message("Adding Serial Java Classes") QT += androidextras + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +exists($$PWD/custom/android) { + message("Merging $$PWD/custom/android/ -> $$PWD/android/") + ANDROID_PACKAGE_SOURCE_DIR = $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR + + system($$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR) + system($$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR) + system($$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR) +} + +exists($$PWD/custom/android/AndroidManifest.xml) { + OTHER_FILES += \ + $$PWD/custom/android/AndroidManifest.xml +} else { + OTHER_FILES += \ + $$PWD/android/AndroidManifest.xml +} + OTHER_FILES += \ - $$PWD/android/AndroidManifest.xml \ $$PWD/android/res/xml/device_filter.xml \ $$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \ $$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \ diff --git a/custom-example/android/AndroidManifest.xml b/custom-example/android/AndroidManifest.xml new file mode 100644 index 0000000000..e6a349cb50 --- /dev/null +++ b/custom-example/android/AndroidManifest.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/custom-example/android/res/drawable-ldpi/icon.png b/custom-example/android/res/drawable-ldpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8676e6502c749cf0015a93c47c76c42d43b251ae GIT binary patch literal 20526 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F(QWTKjuBBy{?hvLGUqJakmU0qqEPb}zQ?(1vl5e?Mg>EgP<{zP$6U-ROQ zu2a7sRxi%Jw&(k^v;VeUw|lQz`~GlIyvbvLx3(rf_nY4%M1;3f6T0AWQd-kD9X5C zB7=f(YKIF$hBd>Q^I=`C3=swlB5B@7EE#U-G8lMT#JFBV&*2Bohp{DjnN#sh3w(sdU6`)JjJy| z%o3RrXF2E{s+=il)M�PV*|l=S%D z)AOqf92giLmegJRr=!1Fs==DAA@|=R)pslzaoh_^zjvo?;&<4}u;Asb@XrOHuyI{D zVdu@8PoF%w;dR6*I`LF^?Z5Ox@dv{H=KQR)`SbnjgME)w8jWHb-C2G-ICSQV&r+H5 zlQ>(F?mX*v|FfO@{~y`QN=H1Cc1CE4JPs5p>~opb^Vw*rQm4}-&7-Q9{-->;uk)MP z?!GC*hAcbA>WR85Vw0J_d8-RVlpJ{Uoq^%g?)-ySG&qj}HTE=evN)dL5KdIQ z)xnt56`|b6AwIM9hvGpG7NKqxg_9j3flA&JO+5^QxN*)_l1-a!&&`e3ua#^+9GA!W47@5h1D7SxBBgz zj~g6#A;E5ZB*#GS*kPxQ7CM}hlTU9{TEnyYnAC=_HO#v^zb2pGSk5BU=z4(DjHTR3 zAyLlJBf=-b?}o<;1sN3+!CRc>oXjnOht!oOukhZYwoCBm5s4%t!}bUd9p!66{lfYJ z)g8`9%vFRsosHCYPGIufxFqC~&?UD^c|poAbym(c@sLuUeDYRG_9k}ADLM+;Ct9D( zeRBAT@e}DMil3sn<|a85F8LAsNF(S}mY3vHfu|-<*-~d1IfgEt6?AvS!Vp2z{wSxl z3%3QW4{To{Y*ISQ@@%u1r}xsei>6+d$`H@^p1J--$u7aWQ|0`oUkJZ+`lb7e=`WbS zl=JYmi8deaNY{{@Ex|64E?F+IeumF7$;;i6$3qOv4PVcAK9hfDerSZ&Hmw@biKn=x zdQDZEDy^j-vU1h3RrgkLhkgz{9n!xtF1U7`Tc~mHe>d_u9`{m@QFl-8KgT-vdGO8PyUV$j zi}~7GeO;%wDtoE)!rd*_s-Zv4yNvdDMa_T;rjSw=362#t!}?6!99TGea2*X~{}xO}JIWWUw(uB9K| z@NwJ8Z7a7+Zg_fw?e@BDx!Y zH{DKew)C;PC-y$^D*0L%`>^WL*SWJd&pz~a#qIU)%-&_bYrix9jLCe>d6CA&7Y?6r zeh~QdqCNNgsRr5i*VOqt`!}Xte?weiF{Ks~WZOrc( z-HVJrV}4-!iS4KT59iN|Z@uqaulzsdf7Sns49go-8Pl0N8yy>?nSTGMs!`nEXK!^o z_1mVKZykFU>~s`$>~C7z^z`6b#f%egCahKb{(Q!{iRUu;S_A4{T)V)Y_$;yea2=0& zYkO;Wn|)tFM}*Wx!|A5w7w~uqa%k{cmrdoEZ^s;PjneQ^$Wq(XB zE%MCOh`AA-Io>jsdRptu@^bdw|MT{9`=hy!xF1)G&(J>+TTr?1+@UY6%f(je3F%l( zbMWc#vzYS1Q9x^jSdZ!_;d0eJuF6BQhtiewFPdHKxZxb5CFl3aL(8{n(wm8UOe9?^Mp05k-A*loR+-^iPE^P#l9&$H9T$q+0Ijz(^k*ZKKu5}=2N#P zn9q4X|NmQ|LqZQHZCl#r9j+@I@oev!EXz$cg_XCt9*eSSw}r8-vDwkJO)K}R|LV8l z)7RDQRjcyNZj3v4s_EcX#_ZSJpLO=5U*2G_JbEWM>JG<72+!miM zT7N_1PQ_E{_WV=(XWp5zW##H4J5$c5T}pfT?4IttXufHyrazm`m&bea))wCTVO!pQ z{pNaGfBIRC+q;{$IqzJ&-)6_2)a577owc?PSrYOkt)mB z$?2cY_spF-x3*62=bePxi?&riPd;})i$DMUE`gGVmt6mMKeygveJhIR>@!u2w#o?{vP3ODqSM8(!-MR7pPJPya z@&%tS-f{oV*4ljj-^8!|{LZZXGy6}s@wUC5XJKb)`N+QL@5?{SozJJ7SDPpPZ_&Tg z>%_(M>wa8)ef`|U85b8$|1^E_{@j|Se_tJVExG>ou|vn?_MNOSHjMic_WSL@@;l|S z?-$?a_kU8OP_OYnls47Yg zuJQ{>uF6ifOi{A8m(KO)W`OsL0L9E4HezRRWu9l~-&964qBz04piUwpDTj zS*Q@<8=&BvUzDm~s%NH~Y-nhxU~Z{rXlh|>WU8ZJWMF8jZ(yl!XrOCgXk}<%Wn`cL z1xj{Y3JMA~MJZ`kK`w4k>xxp+Y?U%fN(!v>^~=l4^~#O)@{7{-4J|D#^$m>ljf`}Q zQqpvbEAvVcD|GXUl_7?}%yCIAPALuShJ=H`FuG$EGPI8Lp?Gv?vGcw3KB1)ST4Z)Vz{neM3D%tojOIjeody z6f5D8$r`uC2GI3}F$w0J$lL91$Y$|dKtelHd6HD@oLh|!->>#NO(SLGw2B#_o z4d2A%%sf!1O4CLkT@xb45$2`3B$lMw85tOw=^B{m8kmF_nphc|TNzmB8kkra7$6w} zQHf@TZ+=Q>L2;sM-|=xjQL% zx;mQ~TAG>Z8tEA#8-t_{$sBN+werj>E=kNwPW5!LtH>?T%gju%GB+?zO-VLL)-^Lq zOwlzlH%rmAurxE(HAzb{FitW`N;WYx1xJRjFS2$Fqh0coOF{Y0)5Q)_M5W{>XQo&o zyl0$fXqjY?oTzJ@WMryqXlQP!n`C5SrkiMJW?*KLmY8B{35j)IUn?ZTFf8&f%1qD9 zOUyx11M*8sW{Q=8xnZI~Qi{2*QBs zhPsKV#wn>L2IeWrsb;Wffg!BCgajB^6>dXN!;`4O9AYl2 zM%)%8XC&sOr>5BH!~6ylK-V&u*_l{C^`J{& z)fkCOBa#GEBP61bn&;s16CxVq;%3KXqYv&?fO;5UDR{j@D+bhIv@#xI?x-b@a3GQ# z4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b z2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4 zQ8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciut za1j|$5M`sm1qlZt$NOCl|hzux* zveDpzgaeTz-r(XwY~@YOOR-fdSF*QDpD{00 z3=E|P3=FRl7#OT(FffScPl`Y4#=yWC>FMGaQgQ3b%*v9`tD?v1%PW%AjP~}lICv<` znh>EB$>r6^v{jR9#Rb*1R~BszV%m1$71OJT?hw|M4MOY%Ok1V}DR(f72{<_%5D?-} zY~)FiyMOx2vFhLM^Sll#GjnoPuibqu`uV-`Z{OeUJ%8`_9OWgdOD;Ee9LPOjp}@(( zzK8MZU!E3@cgsaruoN{iAMiVH^{)I=Ikh;JJI~qv)p}04ov@=bhbgQ)J=R}{y@qMe z58LMVT8kS(4?K6M$>+SoD#N_2;OhyM2O0*umkaEYtynL8{?CLYhHXrI3A5GtW7z*} zzW>0L(NS6Xg$ak$OD}<&Tq8#q!JZk=ZB)o2QK%zf#Q`QE{Bdt+d~Oe)iKu2&AK zIwl8JzgzR-Pul^egq-=y0z)Ubu&fnZx=zwPl6O&HyNwBtWtqXJ4FVy>+}o60Iie(4 z5*7AN;L>3UJDI1i^Fq7Aak=BhTN~$F^}cxA`h5USH|jx~g_sRtMqF?waQ zFPd+zamry*1j8N`W_!k@-$6wz&5XZS3I&MNyqn*0ev+j`JL^N1H|l4$?4RGgbQjm} z>(2vZ`CRfJJ2bOPaQz7>TfX96qBzTi6F2(iI0;Mp9Qf7#ai$5E_=P{;>Tcb;*ZVhv zvG15r%oe3b?TJ@jocsE)p!C|U#;Kh~6E1jvQQ)}IH}{A|wal{ee=RE68{b%TRsNj4 z<=GpzX3o1WQg}A2CC-@8aw+B5rdQ09^83zL7yQgA{&!L7dHQYsRc2e^VPn0#MQViv;6U7JK?)$7hm{Mvdnb$Qs&dI>V?I` zZb*p=TbXI8O}U-cTRcyH<=I=mKIy%kH`hJrm#2aY+ny?ueS!UNBNUI_J}$87uc3(g zmAk)fe52!zOHAtdzia=)>gN$53v%N%r|I)0T1PZ|E|JXGy2WbFEbi{~lr1lxscOGZ zeO5b}?@#H))y~=4(uegYH~76X49!ZJb5!)i!8n%mKa89!W`5_F+MaXZx%*_!y61v> z9<^VX7VmxevE-Kg)5jLhb5-LA6z;IGkqP`1Bi-KHBe7et_~*@^#$j{TYpw3y!^5=d zMy|IG$BI>5mvRy>ymHNO{*w{&Q;|1+?Q!c&rH9q?j|>|_3)DJMmKH#(T!nlWqVh1)|5yU?XX{WD~*LwD*KF8XlS(F zN_P>ad3U#*P|a5PeLzsaA$Pk|wDmpibY;$jx>veybX!^e)fygqqH#u=Kj8O=;1|tp z!XJM|HHrB-ugqVV_OD7y=+er)xsqCXeR9^bzg*aoKFjW>LiYO054FB7@yox^7xC@U z-^ki~oJ&=gh*#;POzQX?BRXs1#TNOf&bJl1&nGWm+%4~#@=n`A+G>Tztmehbx<158 z{_yiXvd6f+t@ZpvojeCF9tSQyhYQ&Ue#Ww}&iIoRe{bKGW2cW#c){3T`maayYN~7K z#l1)3HOj>QcP-`p`{d#Yhu6nqcNje0ogp@f=d6GJ(WuG(2QHP=EK^ImS=%&g%h45Q z7s$`;kjZ@Y#%=C@`G37z(=N~X=Q=F><)ee{?{%bS2yC*R$o_MItZesPzHe)6 zO6oda9P2$;b+6U*vqIYikv(!V`W9dGyDV=!p{D7=F}HNyX}yyMstTZrG9zg(nLS7m93oXcOCKrpZ^i#Qa)w<&D#Ri|5;j)oz(M z&AjaK3EOTpGohtRMO)@=7ZF{$wYl4Gn*1xPbyqW!l7!plyj5r9TzZ%B-@X@1zeA}gqSqwTFbL=h6et+VphNJ?}VDpUl*?2wzLs9n$CUkcE{>% zoqf5#H_B?V?bSc`DJ#l|Kl$!oQ>j{>zQdIfD%RibBrRES!LEFcYO827!_w7?&WD)a z{8e7Cg2PR=)$?F~eeyK#6{TKH>rl)dQ;fRC$hVK%) z%ocEUuoYN|UKD1GR9^j8S)ruL@j~VVWhU#xhh8dF)+E*4dQ4>qEuYcRc&Ax*u)XTK#L=7oVx& z|1Ym#KY3@9zF%nQXV-SK@+EFuiymyefAQtk+|_3K|BO=al-?H-cQwp;yxhO+%%87E zK6K|UGZU53mn?GSFu69%dDZFH{*_*}r{nk3?_d7kX3Lv(>mLcV-zl2-+VoPwT0h~- zrF-`6`sq`g?0rB~k>SI)Te5P8^-7%{{iyU__Wrfizk93a^R8c=Wp(HE&-h;}{H4#^ z3E%ksapROev*>-x%Z;D;?J2$b>}Y(OE9>-n$@yh#Cjvud?8@gfp@}1h=uledG z{=C{-dr-Mp^3#*|@q+X3Zt?h-(y-%*;`Wr9Eq7u9qo$Yss_5K%^^)ERDbD!%^>W6i zrS)^J^T(LqYCcn2ackf1=f3+&75XLKn7LoPRGA&idi?y?vdi%rM`s3!GcneNmf7qs z@Nn6Z>0gpl@x?)KLW*X>sWY>iX1&tA>8gIZdh^j7ftSZK&ldOZ`T4l~`rAA2HMf2{ zEf`jv&plJ&=**z!jEd7&>%R90yfRPL{dMvqdr7McPdTtdZVBp-|RW*h(h_I0zuGmzxnCZx(|ycKixP<#VY>)lg>E{COB%YT4c8D{@zVHmux7CkPmq$c1h^c ze0H(;#^OJ03y#$)Dl)4n+;Dc>Z2$RI)0^_^Z+Xtx);#-V_bLL^l=#nc|^;6vE;Kv{aaIy1lb2a)ROnGq{KTv*w1t=<_7o92KGDL@3O?7w?^onxmkHY ze;p&!ewM!YRnm8#sU_~^YP{WGS#mGA{I=hI_9YDQF|H53GbA^h-Fuh+3G?Je)dQXK z0u^!}(yjEBihu8t4`>j-v-