From ffc8e75d7c692c5977516339bb2575c4a1266d5d Mon Sep 17 00:00:00 2001 From: fhuya Date: Sat, 22 Feb 2014 19:20:04 -0500 Subject: [PATCH 1/7] Removed UiLanguage as functionality can be achieved by a static method using an application context object. This avoids memory allocation for the creation of the UiLanguage object, and prevent possible leakage of Activity object, as only an application context is needed to make the config update. --- .../activities/helpers/SuperUI.java | 4 +-- .../activities/helpers/UiLanguage.java | 29 ------------------- .../src/org/droidplanner/utils/Constants.java | 10 +++++++ .../src/org/droidplanner/utils/Utils.java | 25 ++++++++++++++++ 4 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 DroidPlanner/src/org/droidplanner/activities/helpers/UiLanguage.java diff --git a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java index 5f25ea278a..c8f43cd6aa 100644 --- a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java +++ b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java @@ -8,12 +8,12 @@ import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; import org.droidplanner.gcs.GCSHeartbeat; +import org.droidplanner.utils.Utils; import org.droidplanner.widgets.actionProviders.InfoBarActionProvider; public abstract class SuperUI extends SuperActivity implements OnDroneListener { private ScreenOrientation screenOrientation = new ScreenOrientation(this); - private UiLanguage uiLanguage = new UiLanguage(this); private InfoBarActionProvider infoBar; private GCSHeartbeat gcsHeartbeat; @@ -21,7 +21,7 @@ public abstract class SuperUI extends SuperActivity implements OnDroneListener { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); screenOrientation.unlock(); - uiLanguage.updateUiLanguage(); + Utils.updateUILanguage(getApplicationContext()); gcsHeartbeat = new GCSHeartbeat(drone,1); } diff --git a/DroidPlanner/src/org/droidplanner/activities/helpers/UiLanguage.java b/DroidPlanner/src/org/droidplanner/activities/helpers/UiLanguage.java deleted file mode 100644 index 03640f9356..0000000000 --- a/DroidPlanner/src/org/droidplanner/activities/helpers/UiLanguage.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.droidplanner.activities.helpers; - -import android.app.Activity; -import android.content.res.Configuration; -import android.preference.PreferenceManager; - -import java.util.Locale; - -public class UiLanguage { - private Activity activity; - - public UiLanguage(Activity activity) { - this.activity = activity; - } - - public void updateUiLanguage() { - if (isUiLanguageEnglish()) { - Configuration config = new Configuration(); - config.locale = Locale.ENGLISH; - activity.getResources().updateConfiguration(config, - activity.getResources().getDisplayMetrics()); - } - } - - private boolean isUiLanguageEnglish() { - return PreferenceManager.getDefaultSharedPreferences( - activity.getApplicationContext()).getBoolean("pref_ui_language_english", false); - } -} diff --git a/DroidPlanner/src/org/droidplanner/utils/Constants.java b/DroidPlanner/src/org/droidplanner/utils/Constants.java index 1f97cb35d6..efdb187f60 100644 --- a/DroidPlanner/src/org/droidplanner/utils/Constants.java +++ b/DroidPlanner/src/org/droidplanner/utils/Constants.java @@ -43,6 +43,16 @@ public class Constants { */ public static final String PREF_UI_SCREEN = "pref_ui"; + /** + * Sets whether or not the default language for the ui should be english. + */ + public static final String PREF_UI_LANGUAGE = "pref_ui_language_english"; + + /** + * By default, the system language should be used for the ui. + */ + public static final boolean DEFAULT_PREF_UI_LANGUAGE = false; + /** * Private constructor to prevent instantiation of this class. */ diff --git a/DroidPlanner/src/org/droidplanner/utils/Utils.java b/DroidPlanner/src/org/droidplanner/utils/Utils.java index 7df4dce244..2397199671 100644 --- a/DroidPlanner/src/org/droidplanner/utils/Utils.java +++ b/DroidPlanner/src/org/droidplanner/utils/Utils.java @@ -1,12 +1,19 @@ package org.droidplanner.utils; +import android.app.Activity; import android.content.Context; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.preference.PreferenceManager; + import org.droidplanner.connection.BluetoothConnection; import org.droidplanner.connection.MAVLinkConnection; import org.droidplanner.connection.TcpConnection; import org.droidplanner.connection.UdpConnection; import org.droidplanner.connection.UsbConnection; +import java.util.Locale; + /** * Contains application related functions. * @@ -55,4 +62,22 @@ public MAVLinkConnection getConnection(Context context) { */ public abstract MAVLinkConnection getConnection(Context context); } + + /** + * Used to update the user interface language. + * @param context Application context + */ + public static void updateUILanguage(Context context){ + final boolean isUiLanguageEnglish = PreferenceManager.getDefaultSharedPreferences + (context).getBoolean(Constants.PREF_UI_LANGUAGE, + Constants.DEFAULT_PREF_UI_LANGUAGE); + + if(isUiLanguageEnglish){ + Configuration config = new Configuration(); + config.locale = Locale.ENGLISH; + + final Resources res = context.getResources(); + res.updateConfiguration(config, res.getDisplayMetrics()); + } + } } From e38e455b541d1c5fad91e0a5b2b26f8b152fee6b Mon Sep 17 00:00:00 2001 From: fhuya Date: Sun, 23 Feb 2014 05:10:32 -0500 Subject: [PATCH 2/7] Making progress toward integration of the navigation drawer within the app. UI is in place. Needs to tie functionality. --- .../res/drawable-hdpi/ic_action_gear.png | Bin 0 -> 1153 bytes .../res/drawable-hdpi/ic_action_less.png | Bin 0 -> 1061 bytes .../res/drawable-hdpi/ic_action_less_blue.png | Bin 0 -> 999 bytes .../res/drawable-hdpi/ic_action_more.png | Bin 0 -> 1172 bytes .../res/drawable-hdpi/ic_action_more_blue.png | Bin 0 -> 1111 bytes .../res/drawable-hdpi/ic_action_plane.png | Bin 0 -> 1263 bytes .../res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 426 bytes DroidPlanner/res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2842 bytes .../res/drawable-mdpi/ic_action_gear.png | Bin 0 -> 805 bytes .../res/drawable-mdpi/ic_action_less.png | Bin 0 -> 781 bytes .../res/drawable-mdpi/ic_action_less_blue.png | Bin 0 -> 745 bytes .../res/drawable-mdpi/ic_action_more.png | Bin 0 -> 848 bytes .../res/drawable-mdpi/ic_action_more_blue.png | Bin 0 -> 781 bytes .../res/drawable-mdpi/ic_action_plane.png | Bin 0 -> 921 bytes .../res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 334 bytes DroidPlanner/res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2837 bytes .../res/drawable-xhdpi/ic_action_gear.png | Bin 0 -> 1379 bytes .../res/drawable-xhdpi/ic_action_less.png | Bin 0 -> 1371 bytes .../drawable-xhdpi/ic_action_less_blue.png | Bin 0 -> 1277 bytes .../res/drawable-xhdpi/ic_action_more.png | Bin 0 -> 1518 bytes .../drawable-xhdpi/ic_action_more_blue.png | Bin 0 -> 1420 bytes .../res/drawable-xhdpi/ic_action_plane.png | Bin 0 -> 1772 bytes .../res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 527 bytes DroidPlanner/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 1056 bytes .../res/drawable-xxhdpi/ic_action_gear.png | Bin 0 -> 2041 bytes .../res/drawable-xxhdpi/ic_action_less.png | Bin 0 -> 2079 bytes .../drawable-xxhdpi/ic_action_less_blue.png | Bin 0 -> 1942 bytes .../res/drawable-xxhdpi/ic_action_more.png | Bin 0 -> 2305 bytes .../drawable-xxhdpi/ic_action_more_blue.png | Bin 0 -> 2194 bytes .../res/drawable-xxhdpi/ic_action_plane.png | Bin 0 -> 2510 bytes .../drawable-xxhdpi/ic_action_settings.png | Bin 0 -> 757 bytes .../expandable_listview_icon_collapsed.xml | 7 + .../expandable_listview_icon_expanded.xml | 7 + .../layout/activity_drawer_navigation_ui.xml | 20 +++ .../res/layout/adapter_nav_drawer_child.xml | 15 ++ .../res/layout/adapter_nav_drawer_group.xml | 38 +++++ DroidPlanner/res/values/strings.xml | 12 +- .../activities/DrawerNavigationUI.java | 108 ++++++++++++++ .../activities/FlightActivity.java | 2 +- .../adapterViews/NavigationDrawerAdapter.java | 135 ++++++++++++++++++ 40 files changed, 340 insertions(+), 4 deletions(-) create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_gear.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_less.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_less_blue.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_more.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_more_blue.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_plane.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_settings.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_drawer.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_gear.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_less.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_less_blue.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_more.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_more_blue.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_plane.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_settings.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_drawer.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_gear.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_less.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_less_blue.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_more.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_more_blue.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_plane.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_settings.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_drawer.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_gear.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_less.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_less_blue.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_more.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_more_blue.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_plane.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_settings.png create mode 100644 DroidPlanner/res/drawable/expandable_listview_icon_collapsed.xml create mode 100644 DroidPlanner/res/drawable/expandable_listview_icon_expanded.xml create mode 100644 DroidPlanner/res/layout/activity_drawer_navigation_ui.xml create mode 100644 DroidPlanner/res/layout/adapter_nav_drawer_child.xml create mode 100644 DroidPlanner/res/layout/adapter_nav_drawer_group.xml create mode 100644 DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java create mode 100644 DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_gear.png b/DroidPlanner/res/drawable-hdpi/ic_action_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..23471f478021167ff2e4109de6f35041b2b0f4c8 GIT binary patch literal 1153 zcmV-{1b+L8P)$#L zx7!OlJ3B|0UF*UIf*>dWsFK{U)*gt6c%D}vnLmpGkoP>VARixfkWkmrAACTCFykRtM6y5|v72Mnv8| zC-T@Bb2~1tPs~!iUSCe5BlQTV>fXP|62$k5>BZ%W)CR1zKZ(d;+WamYMqH`jJcVkt z+UV)&=`?`f$HvBf+}+)M55Q#F!rdUbJw87E<=)=jD+65G7l4`B}Ze(QSGm@=XLB`xJ z7K^uBbtR5~@B4Yr^9rgu0bnM9?~8i9z8x1(sZ^##g9L0G@3&n;!*1P)66b6&-?abUK|6lEka(aih_A?5fLY1cD$aL|4YUuEf!S z^_z%{0C-+RG6Ur9tLj%S_vJyFIcM=vP7c6J0LEni@lo#Gt7zt&dXvilNp)@JoD5iN z4@jPjY)Sxu`W^%^)suZP;H zsi{{9OhnEBw2A0T z^wq4Y&N1`DOYM5he4wiPjYi|2{|#VeWyS6H``-h2Y|ZMas@8J3T&rHMe;(G)^Ss5u zU{C?D3Si#q`^j;f-;R!s!W##uR4QLPj`IV6Icp{lUDw?Wg5V z@Bi9rwf?#>fN17_iU%Lf`cAXi{CJ(^uU4ze0Jh`RP}R2MI6qIa5{UtfF*8K;V=Nn0 z{j*dmy-zypqgJES>AV5(Z7e4u`X%X}NE`RoO=IvxL_rW-luD)ds(Kpvc?@79 z)j(#9DT~OurPrM_25&>C>W;Oi){Qac)BsdDs@5ivjxpxBG3NP%QmRD& zg>JXIG&O*TJdNMya=BL0!FZncL{(p?>I={Fo+RyO`>=gq8z8!vk%*jM6=8?W`~wkr z3xENzh`cq%JV?^FUax-^k#pPkw41mb{aAYf?Y{=_$ol*U!0QS6w{73409Y5ZanbcV zB6>FD(X;4T68n-Sz$7=+1!jJAr8DMN#+ZdPeI@~j@9VSUt{STPj)-PPG@DV?chR+E zl+9l9Jw1S`&W&mJl9|66>+rueFUJJVxugJN1BI%d0QiQPA9|j*c-2Xi&*y*d^?H9K zS@wKBuOp7%#W?X%)sv|KnE3+{tq~Co27?L_4F#yxYJaDp>A_%7VP@O+bP_5Si^r;Z z5gl)l`Lm(w16wOU<{Q%n)*0oY6JI^AeA&Y1bY0@_YfN|AK7t$lZpwA_+7kg4i^ zlt2)=FIOz?WN~*`@_#4G>$h#$UrZT5 f29N<{08`n&iQQPT1!4&600000NkvXXu0mjfRa5l4 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_less_blue.png b/DroidPlanner/res/drawable-hdpi/ic_action_less_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2fa08706b65c1622cc46c4ec4f12f500ab0f5a GIT binary patch literal 999 zcmV1g58Fvhq1LoF9p1S6+SYY+pIQ38@Zi09GxM9@%=h=3 z-|q(=Jb3WnVJ}0tHdF6Z1-^yzNaGS%$3O&up!%BznFeDLVU3Upyru2v^1q=#bS#MA z9+InoUvtzFf&nBCh}5TdMuGS{A3v%(LEZuO=lz`rW)RE)AUOoo0@Zo_zJchbeDNXI z&t?9e0#Du_#55AX8At0h$T&hKXgU3{;JCijDTHW3&Pg(`cK=ZfW7l6$Kt1v@+Pg}H(NT%{!}AE zJa?SNEUQ*{Gbdqeit{#YY80=BF*BhpFCL&Z{01`EQe{ zWtnT*lqrTA4NH_|uGuyOz!@dWMG8g7g23mjw~_KfNjtwjonGg>6GwDhtf8sqy_~BQ zQP&s0Mkhp6eeG8=U7%3!RE4^vZ0eZb+qD;UUmDz(`ZTrYo>n$?mENg}(iQM6oX_5{ zk{6reeQ^9P!STDBvIofv_2pNxOH@D_mvZkiq0i~@vmm=bcG>T`Zp9idD0}NRU>(bb z2e-l#dM!)%pU;zBiUMLSqMXs*#g(7WfWwZK!>UaeGkLO0 z@-NnOvKsws@%Fe++~)HYB9_7DH{G>{1jkCe=$deW_DLI(AUL z?|{|=9qZ2W^!>?P;**uV{@u5+L0Kb6VaM%4Gy#QOX{7$EE2OrJ%h?D`SRz z^rsqKUwnV6(UD?)Q!-sjXd?A#5ZyVu5YJtuQY`6LspXo0ZryT={zX>4_z)P)QfbBa z(iJ6QNk1#TmyW!6RLR;KN&OxxtL%!x)~+Zm=2tBK%i?aKmEFK@Ze!@;}_dc VTjXrK!7=~<002ovPDHLkV1k}{+Oq%v literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_more.png b/DroidPlanner/res/drawable-hdpi/ic_action_more.png new file mode 100644 index 0000000000000000000000000000000000000000..e9dc3392aad1a3c03b61ab26ed2da885c18dd2ae GIT binary patch literal 1172 zcmV;F1Z(?=P)pb($pLuh@9T}yImWNE%0yss5T z);`5*g{XgE@a~&=Gv8{o@68hfpm9b$c&E*6UiaU8dY5tnbekOe_74PcF#LuQ_I@d0oSAYtZhW6bGI z;(xS&APDX-^Qx+@h{#0un5v#J^9d3Ck=?orU`9lyuGqCiWEa4WG3Mew6R^CzTyD49 zUorDNdk?@dfNG&os3l4Au9sgJhI5@xXNj3B%skuWd+2%IkNf-k^?zN!($dmrp67kd z%ro|$s_vD`<*hi5&t2w-qG+;Sudj>9eR~hUNxR+tp;oK?Hb_1L3CN!Ow>J6gsc)uf z`eu-z7T@<5n0do~8URi_&--qWPr_M15CnIK=o?!$0DdWzN{?Ni`gKH6G}&l09x(Ig z*}R8D^u6nM!g(EF=GCs`kB5;w5m6k+=cQ8VF@WPN&OK&cb@g`=5Cp-rs;<~;0Gq=| z-V(?0Ie<-jt*R?Q5KQ;;u{a3;ux4MCs=D{FHQ$dkP2Z^M9ubj&l*{F?)PYC#_bCT@sy`m_W5!{j=9tp-`yV@=?`ABKo!8T)6_WjTx!x zS(>IjS6CvVR;%?TGk=jcUuOG~h<@rdmL$nL-}lc%WXi_whs&3EnusXd+w|j^s{Wog zS!VOBpG{Y++&7W40QzTR))QmQ1v5V+qJ9g|1v5W%Sfp&Mp$Krs7;~hmPp=zS)u+ao zqhZE$5n%W0cU>k-)AVN|devj-RW{~=jg{LgI12zUlV@lF@C3m7uIu*zo($k`W8GW; zfFmLz5t$0ZaLy$GW6TE;c?3WKsE9l=#(Z$`4a0EGHa<3XKXL_#$ZPw5r_)(-NrH$d zNs_nB{G6GeCrR?w)vr57ckFBP%QGkziw6MCiHMlF5=D_y-%CVfjCo;w4VcypRFd z$=W?)=GjK0@n9Gtx>`zGI)?yuT>bw)O}%BTk5w#VeXwO2>!ZbP#`bXcDr0-RK5EAP m7n)lEqvlq?sJRs|YW@N>HJam|NVeYq0000UH6vPdX*s@~uMG(P&0Q0^4UqUkz8$XSxqa@f{~eI3|8 za*tBZr|HUFw@sO9(8=*EUAgN(+H{>UTvo73AxUoZ0-F?O8`TSqJoy7Tymb1-G`r4G2>dr%FjQJ9seZgd|M!u;C0upa7ZO>@h_OAWdlRZoNSU!t?E=l5$OEH+zDH z1iyjs&N&JdR!KD@@BN^Y<5`rHX+{ipRRphv)VT!aJ8|4aKQl>gd`MKNLe#Lg*3z^|ZWQHHvn#=r31R-jg zS;JiwfdcgQz(<4y)9m+lQg+a3T%E?XwKu-K&5f{Nb8=xfjVkx?mbie%C9!_qIw(tc zK8st-UBej&D*@iRTxLpaGFMY71;9%knJep=u|00FFJ#>x9ssMR)z7E!lV*sJ`IQKt z!cQpei&qVo-S~Fj)c?PZRf>b!`CzL!u$_+<|Kp%t4|l(C)ULt^YIFp& d8XWW|a literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_plane.png b/DroidPlanner/res/drawable-hdpi/ic_action_plane.png new file mode 100644 index 0000000000000000000000000000000000000000..592cf22762a02c81c5d6eb07aa6682328a0d3f5f GIT binary patch literal 1263 zcmVB~7T zOd(D4lJ{Ox6QRFd&OPUz-!J#Pd(V9js!IQ7aK8z3i(>)(#<75YV;}_p;A}Q~wooWM z(9w60wow3_$z&{MejLC!5s|7c`M!TyLx>KHfcg1(V`F3ESpb<9!ymh@d#zR6K$MVW zS*i8)^%p|Old3)x7MnUcTG3!xR%&~D`$cA+Y~%KQ*g#(en5H>IL@xn&ILt>x{u~`0 zwZq2yRzj1LlW71KI*?Z)`lMJa24OxOR{#J^(|lA_pCF}xWm&gXDwUUs=)rd6iRdHW_ZQpcZ7ZOj=rIwQW9GX$O%z51!0$v< z-WR8;(*QahP@&sqGa{V>*=+WH!!Tw=q`=I>Q6^3b0G~RJ^L1qZI0spM%bQZwSpbs& zdb$aS$b#?tSL4JaK8a^$W=2J%AR==B?oKqxL45AI?w4_cdeTamrg=UdXbnRHagRq`oSVN=#KZJkNVAY0e{S=BB5oPX$46F~W*$xvqOLX`UlFi2-mB z1W!dNClNVSZz&R?=K=sAm&-lP%u|sFFoT&-C(YM$0j6o52QU{iY%m0vrg@Ht&b1m7 zkp)%#wbfXyR_nijY&JWqs^^>SBBCPlq3`=wRdqQeyuSi+x!e>pKf}yuw5w{Ms_*VM zWnlsU+?h0Y$96iO&rgcT86w&NumfNx2!aZLopd@~QPtDT{2Vp?86tAaFpNu{=Uv~o zl}e=>rfF`pXy)z!fUt{uVgZFh;a(AWo|)4Jf>Qs6)oQh{&|Ls;JC3v7JiyGhsvZyk zAeG5vZYQD}amW*OD4|p;wM9flBHC-`*9cX;X&Ap5VaE>85vn6qTNQDs`kEw!r;2@ zcg*}w3lWh76pO_`L=Ifm|C1GHgyT5Z0esVFQ`M6(rf7cGb8=>8W;8C3t`0I){fZ8j zLgdR#sZ?4gqOGR+Vy{A10zA*#1#qRo6nO>ehnCZ53xZ%gE{CpLiQ(blYpVL&{?9nE zhG8_8(N?uuEyc~>wSZ!=7%=l^^`8|x3}kvkB^5oRh=*}UucqIAimIagJS{x#<75Y Z;~%Wa2&>#8K6n5C002ovPDHLkV1j6wKw|&^ literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_settings.png b/DroidPlanner/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..3fc0f1782b86fceb1ed48637983a8e55d15bf3d6 GIT binary patch literal 426 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 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_gear.png b/DroidPlanner/res/drawable-mdpi/ic_action_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..46cad26417dc8481e5859bcd0d08c004c4b90c96 GIT binary patch literal 805 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 LNkvXXu0mjf9En?C literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_plane.png b/DroidPlanner/res/drawable-mdpi/ic_action_plane.png new file mode 100644 index 0000000000000000000000000000000000000000..a375349956c9393af628a1949e89f1eb67e89572 GIT binary patch literal 921 zcmV;K17`e*P)$1ui-7EwVIL>!o6?aS?h#6M7Q zAqZ{-5oAF3x^v;it)kPlYhBLHtppWHCMFLODk4QiM`SV|YGsY|ez;HNR0`TQM0jN|e6_W3gJlbZG7xTJP0a#mGi%DL}CO-uDzA(V*>gq#5 z5Imcv>5X!^+^g5?w~Hi?qNqyp9b*i0Q@`x)?tYWkGhc|TwPi`K8Dm}s5M-wMl6sPQ z3kwU^opU$RG`-&Kc6TKCL*JJqy`4`k>9eOR(nL|T zOtJ>xd6EmWd?fuj8jU{hbUORT#y)8?T3%j$APmEpWR2vLQ)HuqgM$yZwzh7~ig#jw zBS(_f+V=rmm^3fxgX3QP*yip9*4j6xB?kaw%wt93%mrYreI3C1_*v4>d;f1vb~*r2 z6um<7jm*%%7_$K&$?BYQ^8=7H`7#Os*4l{VTbZH0bMDh-v-vB4MlMDnfQhBpT6@WR zzh$q-Edcufo*Ne$@BQB-Hkcm00-AL9mGQH4ZYscNG`f1YO+bNKP`D1X z+wGqu{RjY(rUG=k-J2x00l<5I^R58^K$@mk0F1o%6MOsENH!$(NPaytsH7A9;y8X} vmZn;*o~u+U&lHI_cQ?FScIID3_W}L`-59Q!*tyf+00000NkvXXu0mjfm9eIn literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_settings.png b/DroidPlanner/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..69ca4dac2f264ceef4f113cbd63575867a578273 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt-oLT^vIq zTHj9FD0s+#$92Dj+Jdt@CEpabL^jNfP|$6@A#1!OmGxo(YqPx-EA#Vk%bgzo0{@71 zu3Drzd)e-CMuu(kPC9W^GqnGHYWcio<;qTc`_O%CA#|MaR_;EXwf#+Y^!e0#D^VxsdBrH77yx)+2jpt|Q8?1L2 Ygw-qGzqt2r9?)A1p00i_>zopr0AWIbo&W#< literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_drawer.png b/DroidPlanner/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..fb681ba2639897cc4646d3784b97bbe16f5d4e91 GIT binary patch literal 2837 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 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_gear.png b/DroidPlanner/res/drawable-xhdpi/ic_action_gear.png new file mode 100644 index 0000000000000000000000000000000000000000..3be1a7821c6898d32b667a7b616180d24b2ea57d GIT binary patch literal 1379 zcmV-p1)TbcP)zpvw%AH-Wq{5Fl>?d1D|z-URZ-K!Cgn=N`yrS>>V~*$% zk)t;t2!d1#| z`W+zzpOgdmMJd&gQjP<-E`<0nDPC*6!pxgWsmD^v8Z&?1^$bFYRR9mdFl=YVIa2|o zl%EJ8-s>#~@QjZCsb@ZiBmn3T5tw#D{)c1(P-Sa$z>%#5Cqo%-0hy~@`TnJ%>1p5Pp}#Tn0fZ1be@Pv2*J!eYZYr6 z5L?r#O=FHxwXw~{0<>DKJpfJ9IM)EsY_(c@rg2tdK#))%tA`}Lt1-FLi zc@PAn0B#B)UNgwqQA*tbpwq^5!`cW*DaTDZPehNxFr4q#c_N}P4EL(l>USn~mzj%F z%5ei8r(i7rfYft7fP-SOxR9pq($dn=;o;%001jPn>4niJkhGJNsuAYpwY9ZBOk$*z zp9&$~HEqjuXUXUdu<3jpw`Cdwz&Ivu%ZQ`%O;G?xrBcaw2`hxyaX{y6J1?S&(nncH5MrwGon1e$a1oGlA5>$jHby^?Lmv zP5sHq$yW=7!rip4P;0%Sl=?kQ-CkIK0?fQ=Q1_)yr*k7s-I)5H>+a5)ou z*{$$kF=QI!d0w$nsoZ8}&$Ka@0MOju-=A+bn;nxl<1wIIE{|Tc&Jz(avsW&cM@{35 z1&E?(hls3fs$*=$+>Br~3jkQuT3?terdn$NShR_?5+Dr2CqjtTlfMD%0$8`nWdi`~ z-6v2&h*jH@W9zd)01p7@lYB{RR7 zS<)^5SXWB@WIN|4!Np?eWd}K(<<3-q_?5hpWzKFe^A+Fsr?SkMsQ}EJxa!%N+UEwUEiAraLRrpSfZug__%SNg?ktycidDW&cZ(L&EN5K;X+170F$7rz)e zxg002ovPDHLkV1miugC_t0 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_less.png b/DroidPlanner/res/drawable-xhdpi/ic_action_less.png new file mode 100644 index 0000000000000000000000000000000000000000..0d256c910f85a9bc8225d76b43ca5ac1d85f8298 GIT binary patch literal 1371 zcmV-h1*H0kP)p1n5ab zK~#9!?V3Mp8%Y$v-y4lrav&0CIX1D2fJt0tWoh+?MIk74@HGy>Mbac81osE`2^_9B z;XZ*IH}MCs8?#7Rp~&eHLmh7yh<*Wpg!^+75x)XJ zQ%ZSAMDJ>~+F=lSp`WopDwUe&oSQ_XGsdnB@~o8d2od*%5LUfj|Ldm$V4CKX<2b(p zK%Oy%!}KMkBmk&HqtVxvWqrBS07|72Z?#&>jInzFFmcA;J`>R~A~pe_>9!?^D1nGc z0GK}Gxf3bnPCOpp-re05mkvO&SiIV9x1S^8t?u85=pzx;g%EG|_xJzq*N?92Go14! zL`)&#LXW-VDplZIKIOkiHO67x>e)IYKq7Y(*F?OR1!m$uy zV-$PC&;Z=Y|AvS$rTJd~*sNBoHVrudBBEg!SpZlCfGY}wwh-cvVIi<#&E9?UF-5UP zBocXP+x8n8fq4-T*|z;A5{bMdqJ{z{#yMXr7K>Le1VE`&;_jMHD$2gsG;O_HE;mNK zTbIk_hNfxjMD$*PkZiZx&r78e4;(mnGb4 zwOY%80x(T;%022%*F5KZ!_Ud95IE->?mqMXBpADAn&wns09+?WJ?A(5F#CSX0RT3Y zrU_Rk{{f^@sd)g%t4Ce6TD5}?Vye}uEv5XVo|>+1{sQ2fo2q-uIp3lSC@v5Yan84t zWq_P>({}(wq^lmDS0@JmAeYN6uKo05^^G-PD>MCO-iH&(6pdOaQ<$_dkOMOwC?8`f346GGh>VfQa*bCNd8I z4?OhS48#J4k!&`*got;~@iy;fv)QGf^kPAfcK!6n1B~-{K;Pc8We$1_epS|5;+)Sg z$8nyh$&7Qz6~}R&AR;^G-jwL2qpudwo&M^x@!e;P-5l678M|p1#{F|bPI|R~ff5N) z%0tFZnN91uKJz1Az_#se0ND0x4ePo-qiNc-s-vIB;JdECD6q|{PjI%>Psfo0sMTtR zQpzL6^imfMK-ED?c{FHAjd>VwU-`U{&*v8}YV!Gfeo?I*sJi(EKnP*E<*M)BR}c{| z;LW2DVnuoTB!sYh2jJ%6E6Q$t!_C_VDu!WXy9y>1FEs*Bo?tW@eGLF7O4DkgP?!yB z^6prxO4Es}69fXlvaBys${p2l5kjmDlh_y}ks^dxQynWQ<&M|NvFBJI9*=Jm(Sfoi zXFHwF3qK*4ra9T^bY39hta9uf#N%<#e#TI>LAN6OdslU+!8zX;b(*|TD9j2W*19Ht z9E-))hp7~geQ`7_kB1i|!YeZ2B`M#|?6JKj*GtCoqU6sY;brL%KnNfN5CRARgaASS dA%Jm}{{VHJ&H=d=E2sbf002ovPDHLkV1n)aa_9g6 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_less_blue.png b/DroidPlanner/res/drawable-xhdpi/ic_action_less_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a0d6b08fb8a82dafb3b08a4a4cf0539abc7cdb GIT binary patch literal 1277 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 LFMN&5>5P8?ST4)T literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_more_blue.png b/DroidPlanner/res/drawable-xhdpi/ic_action_more_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..013491e2ca2c9c57b74bb173246a1d888be6848e GIT binary patch literal 1420 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 LtDnm{r-UW|Q4rsb literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_drawer.png b/DroidPlanner/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..b9bc3d70f1d29fec2e4530e5d1809edc8e15ad35 GIT binary patch literal 1056 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 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_less.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_less.png new file mode 100644 index 0000000000000000000000000000000000000000..7af2de4e2ac3e69e222cc7f12db287402191790d GIT binary patch literal 2079 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 a7d*k4eRFZ{t8n%Q1z1~LGOshkk^ci+&4(iZ literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_more.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_more.png new file mode 100644 index 0000000000000000000000000000000000000000..e54637e47ef51c9cc0f4e33b578c092baaf8a577 GIT binary patch literal 2305 zcma)8dpy%^8~<%7bBaY#Bt|0V9J7cuhs`M?BAUfCOwJ}P%_@x?-XzBynnQ$$2anT` zY7bjNB00>H=J?9fRxgXE-e2!O@1O5`e?Hg!{an|5e?Ir;zOL_meeblhZjLgNha>?2 zkij^iaUcf%GT0t){#Zb<1VJnoh4F%cg9-~~fWAbOlW#1zfAW_>P};?bVDMm^{rNc0 z$dEV+A%+N0C=`RxE8($0geamxWX$E_&!-Ln04y1Uw)0ASxc+eCu7cws_FAoXVf?Xn ziCafuAG;DIn9lAS-EgR@8!t^Rw)sYix?$F}b^QF=!bK;pERgvh^S_L9k^%v*_5(X>Mh3jW#X6m>4 zH7FWPpM;qX$)6x7eU_pJO7__S_i;l3jWLH!dNrB$h|c2bPzy{>8M(bxPva;6A9Ser zVgPrA6d;)GF5^=3I`DW%9I|A16L^pA(NdCtFc?hjq5~)uMO1gh)QlmDQHQNHcj&vi z1ieMrV&w`n5Fd~(U4W{w@PQ_VrCdFGYFLb9UVQDXskM3)HF6{zVg$DiTEyR$Lt#Z) zGz$i4-s7+dPnJF}*xA{suxm6+k%v4t+Ofr+JcI5}Sb`=(=2hXd#Kkg*UVPUqPw*xh zk>ly}?e(BUJ2z57NXh$lVt%-ljlO^l%Ic=7{64OH%426MSm4l%cS3b0m3J7PPG zY;1lsy$k#M;;V})Y-C=3{-%jgT^)Usu{!NPhQkJ^EIKEVplFZZiWxR=)K15;N=UL! zRrk5Z$;cvA4m;X^?OT##q393ufhlpo#uIC85!%am1dCc8c{Espr2NQaXvMQ3Ml>Wk zExJBPX!4oNtL)=uBpgG z08tZpOt&l(e0`ujEu^Kx2Ya#t`HI{A0H?2(0UszRe6x3Lp;{7KyTqk>Z#oXrQ-jA!Js=>ZChW~1GttK5dd@kT z*^rsReEHEiJ@OUlAZYLce?cT5C#-hrAP4A-rzS$@*N+yodSx=sjgw60_7@E*=xZsu{ZZ9dMRpoVwU>Ih@G!AN@ZU@Z@Q)J|?$^|awDHv32sxU{ga zAPf0A`_ih66Nm-?aWmrP&~R|(z6S3#3a}~Q|B43_RcM1dn-cI@eNUg3sU0a=ZxP8y z74dx%Bzdp1Kg9syF7r$l%SWnZEfifz&n~=S;E4yT*09Y!x4W+=p{qfrE#l6w zq7MJ5WmbF1U%ad#XnlRX%kmH;_t5q(+XnA#KNvwUO{n#*yB?6B?tRbDo+XPSLV&Mk zP=EqHmZ6E0NaVJ3pAXmnY8#^vGG8|}HFcS|HllwMj@sBR_d1|qW*TAQ0> zi?(<&ey^3Eid(gNU^Ssg=X2s&vgv6aXL-GW*I)Xbvnm-j15W4lsP<)-xGfc>wJB_U z`mwi30@zER2kBX8^e>?rjHSdEiK}yABb)RboHxsCvaq=L8gzcAd=g@L+QMSXFX1cz}VbrvBcX#v9e_w6p>*GT>AADh7sv3?OayXprcwh7X(1)gpNrwJq ziZ3NrpSRQbwhJDh!3@XN9wASSih%jr+L@sH_XV9d&;#f{z$A^!RC)0eJ>b66$|3<2 z?@WlnUEEZ9vYFIVQB5Y1pNBk+Y@9?s;pn~<`5g#?##xnYy!6}m6;uW%1$&2HiBvlU zdwDJu9lM;*_0cHk-gO=p-TH=>+XbkY5HFtxEWQ81rMwHKy&;*JI{(~oPSj!!fVyEE z%FzNrojD+i0kU&(5%=3NBx$Y05g!3R{BAY>vG4OaCwcqP&w5uI8zT!u=_{11FCy@2 zEM2FV0F1^WwE&dt-c(?2p@Fd?kKa1+_^?3;Q<)vm8Jn1v1%(J>0D zj#FA5$I_gNy|izUre+EVJi&uY!S9*FlZgA-sgSpxj#Jbd*1V$n`mYV=VTLP0{{S=2DkMr=;-)2S()i| zAs4Mm2M|ifz><|7k*ux>bPo2vZG)oEPy9`wj#Pdqy$KD{M+PDM+=I|gfo=da8ZGDb z&)BlOuO} z%wp-~<-#xNEaq`AK11JX17;2to>D3-4#V{=GeFNtDJa&D@x$mVD!03(_xbDHnV!Y> z*y4H5wpK$VO*~#HH+c+os)?I?Y4h4tqfJMZZEi`cMHCSxn%jSQ6cJ7nDi;FaUkHp` z*X;qlp+MmuO#UhS9asO4jLwr|ywk<`^E~?+VGZfe;4#_d<$A@}%nUDO8Ice6@J2VQ zv{%ElZp}6!wSr|oyU&9ihuH2EGS*xuxJ7x>HmjLYn6pwY3v~S%$(VLy@6sz00hnG6+bnzk)&H}wyPz6VbyoIK)1a#46f1G8bFhzNB#iEVLZ zQ&4)wj%d1gMN%ruL+m%CyZA*>St^; z;D?fSM=cH~1MW1)pUNkI-JE10sWpMxmpacCK1+Qn4&gV%9VsY`#45yX3qGHNA}A#Y zG~tfh3j3HAX8Uvd0r>f&<0??I3H`Djt9=&j*woY5g4R3K7!T*9z#paftvF+pwn9*w zSme4Tb?1qq($Y23Q7_BzEOvl?6f3AOb7MT*N>T{Y91Sud_P@_A)rAxtes;<$Qx9J5 z!5K#(nP-{;;+IxTvpSaqcXb4GLtOV+lbZ8-2TT6G5nRzrRZKylO>$LGXm}RiT#jSq zj&|*5GX4{}Si8?VTRU6MM4@&SaqkNzErIt|E@_U}hk+IY{hW^IYVi4@eQ!*J=up0G ziiC8#imaivvc4a-y!>GDjS|Xg{+z>wlH_NradMH0P=eHYr%Nw8YKq zOF$^<6fJW|usnzsnrvYd4f|;`_*lBrri{NHwi`BSwin7<1z88fno0h9e4OYx;`ps< za8x@){UKKQEZ-ckx!b?iQ@zT@=)zob{5b?ZvGxL{6;+4v0@zWqIBBL=d$*CiDDU-Y zpm(c;hnM}I7zj-c?2_mpi^v|)s`5`>p0jiE8ZO~Y|s33sSBGCsceB$iHvDZQx7@~yYU_)Kd+{@fV}tA5!;N$0ysB^K+XTvH#wM~WVf zfN+pdu6Rp~N?o#Nj-_B{B(+fTYgN7ul0@#Fb6+`eE^m|e7~@)F13nZ&c6IAv}uRTO1T)VVtKK@_i@2nFI)}w$x#-jkwPPWqA)%i1h+#-<= zVUYD2KHrRt_RdaZ`&Lp<&fMyz6W!hsCR zGkI$zNaHK!<0<<=$DBcLk`!-!LalRm*K1liVn4`yV=wNhf)z;lJUbn12i~{Q9+EY; zi-@c1l9xiQ-_5YcJgJ{b)Iziux25ghM6rO0jOgr&5IXvtDh`k;UKrL{CVgPDVCTM^ zkentgeW#QlqS!>MkS+c*F!qycZSvuyz(7H2H-;FlZS4YAs?EeF;Wjo^&+OW_>dg*3 zh;CQQ4jly7iensaw;Gi3-t=j3ek7gRG!e6P;9sNPi|6Tq749$~21zak05vaFau?ks zswW*{H>Xt}gXDqi9SrAMv!=3guEd9a8xls5kY{1{oRb`$dQ3q>x`iI>IQRyBF=GT^Y)4KH!KALANw$Ec!Z$bVQvf9xEBeg=9GizXW z>$6f<7T=p{$n|R<0u_;_Mnc{j@;m`YHDa8<^xj`LDYpN?jK;ztfD6=ebyyzYf^wj_?fT%n@)BgjC+-u%&@5 z=Yk!W$Gb`E3;94CER-iVO~l%s65^wRFn!?P5-hN&uiGEV`z%=DEbP8fNmP%Hlizz- zO&i_9H6Y_pf#e*LyC_a>EIT6^F0;x0QrLZFPmBDK)^NKncR6IufAPEn)*Ib&=v=Qw zboo>=6>at_1>_{JSnVR`Fi01Q!;ROu)f}UoIG{)KjWYf%cVp)8or7r}@31t^!wv7j z=tItYzQUa!GqqmkucHU*X;c%MXqO3%Pi?-jI;ag@G54NezirDu0ge8(dA-xmVXMy6 vPJTF)dz(SEhkaf^9^=vq!0!AH$vtJT0)`FM>rE=r_XmK1zNub~j$`b9qlF!q literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_plane.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_plane.png new file mode 100644 index 0000000000000000000000000000000000000000..cc89533b50bd637f6e2f0513adf28897bac999e8 GIT binary patch literal 2510 zcmai0i#wFt8efBQuNlc@gnT4P2#FZCK6j=}wp%pVj4wjpKl;;9CQ7;CoJmQFsT1YeEfOWn zBiI{+g@vj52KtBm>Jj9vdMnr`cUd3H5n5Zq#`fWP>^wK}3CH7I{km2ExSd|id5ZAB zMJ7!IKE=+)s^@*mnL%ePt{TXoRYfe6uCTckY{O0U*AFEtABRmXEK2N!OUTv{Hxd_aSSEeM}f>Z2g;ecO;bLR?I&B^6q{U7D3GJj<=!dj>!8@meDwWMWT$IX?fxv7w4 zp%lIZ9^ON&cs5?is4anu$L9Y4e0#ag!FY6|Uv7pE2qjzC!czlU>|sJFr8~_{sOm9$ zAat(~e078M>sPUwf*{XYK}0R>-o4Sh_eXt5G&Mzw09RoH5QprR*(*1*pR#N7Q0?vQdb6ur{P1qV_3IG9xFb8icABbbG`b-@ zaC4mpdYSSAfZkmLkmq1krd#uIOh`gnI!#Sg)j$dI1@)>>2yE{$XB8V8>+R|3`PW$@ zejqd^3DL*Hn+-Lud##~0!FF{8jTAV zLYbwkv=}!hC!KVpfJ3!1H4KpGjBQ@X4L~(vxA5qUUqHP82!RL#S^??wvvq;2KYDw6 zUr;^e={B7r$sOk*EM-ELBnI!+5Z+S!pU0m=b#``EpLJwJOM!G?H1r&=6HlKu?|8dS zmxn?UJtl9Gk;KHr?U~iB^RP|ir*FS`NX$3?IoxK)hvl40e}BIZvY=i+(Gr!8453$X z7&>qbX(&$4VLA$H@{NTjP_LP*2pluH>^0t6%V6S;vKVl-icxTI5-aEHBeXdJQz z)VWYeO65i!;#Nh2XIsWL3l;PF=XV?(9Yf*XsERc{0n+{*&bqtnAEWGOXA_nDeRrc9 zTxr9%h;Dkv;}IPVjWtQ=t^CaVWAn?RnyJX{lvZCXwVimfix7DMcJ8vF&2JE@q~i+& z{SuTgx;C&Z{~xjr?;{wls;wiot?`2I+AgI9{Z2m`rUyHF%sVr+)Tli^cOGHfaX+G4 zV!gdjU51nPj@XSbe$-i&S{m+EKRJEK>56LhL}P7j7H?dhtXv8`Tc}-Uv4(|Tj6h+x zB%fquXUA&caLo&uI6X4`{?o}HR~mRgHpT700GeyAlumv99o2TwROyp+&hdV)m&Wwh z;IHRg#pm)Xi+J9J#)tx$@8hb_^0#qPFSW-a5iABih(hD|Q@k4|7IabfyS-Gf zY5Qn0qtEn{nSw|J;mn2@uyHB%*5j!ZUpVvMOB5d;Z;n~LMjcPKC~_&=f8nI!0Kfyn zC~zN1PYW>QMq|{7EzzPFL;qrF%~r{KT?ORe6vj>F!3}ubn?8~L2y-&iDoxI_6EB5{ zkk7EtA71*P24Nx3`CebGeEhV3SF8AX0-)Q>J%`u-ov#h8$pRgmfkDgQ(o4b@Z3sVB zAqh(aX9^F8#_$4t6{rWPhv8HZ)ada1oX7xyNSq#goht75)b?+^e7vC%JY7ATO;3I1 zYtT5R=gi5=5?_};t~F)>CUtv8tc%NOWynAP@M0fVo&P(B>cf0lTYGqsk`wAiKyPJ{vp6>a>lOMv5 zYw7AnG`p%En87q<=vMexY3PgOH|3L$oX{ER6Xt~jj6}K7o~ul)X?v@D&p9GjTcgZ6 zKUh{6Mi#0)BxxvDgjT+%ca!*b;h#YqPo$7|c3K@c^)K|JA@ ztRD)1?<>;>M@h7D7LLaM&ckn}{hZO`t0nR?*6ig0t-iXvUQ#JPX3-@=j19mo=Mx&=?)sZYgzx9Qs!|n&;ivPlc6)fITQ0dV%adf9*|V zzRG3uKWy+V8}q;Y2!&3D_lHz|`M6n!AQm-Nw(8#^iXN1On5ORx2%lyviKS+e%=!0( zj6vD8V^ANT+)g~N6!slMy73^WH?Zh9Htv#tN@Y0}{Kj`^v$oo-G^rU;FB2R#$ h35rXR2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4Z)zRq6iOH@C}n|Be3bBlUEC;pd-!Hm|z3Y>Hmo@2cyi=hMDzx&5~8 znoW3zy`$yxOs|*!)>_BAs4Oj+7_{rWrGNH3U6+P!x%nZbWv{G4=Wfld4u0(8uE;dw z=2d~~(*#rxELU8otLV}&WfEUuE~g?>#W98i9)@ebr+z5f`N!&rqu1>mvvSpa{`YU+ z{{H-vAOlz$NbH^8;%&RL_vnS~)B7QQ*&x8UYhCsC+jX@d0~td9+8)`e>caUUxg*<~ zLvTUntf@2K`p2fH{a%(CW_qsVNazvnD_TrK3|r4X)bsfBPi;|1E#HSd=N(r{9r$d= zzBG&B{BM~lw;1odD-Kx229n_X=yb*y6lxm|mOHMf<>M-MR6Y!HEzmiOZ?evPE!PQi z$|^>i_b_cMWe>cCn-{Q}<6Kaj!aI)j#WMs>@0j!XOM!*WoT!u;H|vaM+N`_&+J5Uf zu}7s1&n8FK!Tx%@qnALx8uX( zSLaxQohHC&b3W0D<%3Oor_h17GHNai=YclmpXx3UeaKYq_+`GpdB%B$3=+%@*oeQ( Y6&Ex6E;7!p2PRPlPgg&ebxsLQ0Ec}tM*si- literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable/expandable_listview_icon_collapsed.xml b/DroidPlanner/res/drawable/expandable_listview_icon_collapsed.xml new file mode 100644 index 0000000000..ef7dec32bb --- /dev/null +++ b/DroidPlanner/res/drawable/expandable_listview_icon_collapsed.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/DroidPlanner/res/drawable/expandable_listview_icon_expanded.xml b/DroidPlanner/res/drawable/expandable_listview_icon_expanded.xml new file mode 100644 index 0000000000..c73803dda5 --- /dev/null +++ b/DroidPlanner/res/drawable/expandable_listview_icon_expanded.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml b/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml new file mode 100644 index 0000000000..5c8ec633c2 --- /dev/null +++ b/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/DroidPlanner/res/layout/adapter_nav_drawer_child.xml b/DroidPlanner/res/layout/adapter_nav_drawer_child.xml new file mode 100644 index 0000000000..e845d026aa --- /dev/null +++ b/DroidPlanner/res/layout/adapter_nav_drawer_child.xml @@ -0,0 +1,15 @@ + + diff --git a/DroidPlanner/res/layout/adapter_nav_drawer_group.xml b/DroidPlanner/res/layout/adapter_nav_drawer_group.xml new file mode 100644 index 0000000000..7600f43156 --- /dev/null +++ b/DroidPlanner/res/layout/adapter_nav_drawer_group.xml @@ -0,0 +1,38 @@ + + + + + + + + + \ No newline at end of file diff --git a/DroidPlanner/res/values/strings.xml b/DroidPlanner/res/values/strings.xml index f6ff7b3eb1..f5311a7c68 100644 --- a/DroidPlanner/res/values/strings.xml +++ b/DroidPlanner/res/values/strings.xml @@ -8,6 +8,7 @@ Settings Help Drone Setup + Flight Data Editor Send Mission Load Mission @@ -324,6 +325,11 @@ Take Loiter Follow + Telemetry + Flight modes + Info Bar + Open navigation drawer + Close navigation drawer Select device to connect @@ -334,6 +340,9 @@ Scan for devices Scanning for devices + + Expandable listview icon + Manual adjustment of roll and pitch tuning. Rate_P is the primary value to adjust. Altitude @@ -343,7 +352,4 @@ Mode 1: Throttle on RIGHT stick Mode 2: Throttle on LEFT stick - Telemetry - Flight modes - Info Bar diff --git a/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java b/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java new file mode 100644 index 0000000000..c23235ebf5 --- /dev/null +++ b/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java @@ -0,0 +1,108 @@ +package org.droidplanner.activities; + +import android.app.ActionBar; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.widget.DrawerLayout; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.ExpandableListView; + +import org.droidplanner.R; +import org.droidplanner.activities.helpers.SuperUI; +import org.droidplanner.utils.Utils; +import org.droidplanner.widgets.adapterViews.NavigationDrawerAdapter; + +/** + * This abstract activity provides its children access to a navigation drawer interface. + */ +public abstract class DrawerNavigationUI extends SuperUI { + + /** + * Activates the navigation drawer when the home button is clicked. + */ + private ActionBarDrawerToggle mDrawerToggle; + + /** + * Navigation drawer used to access the different sections of the app. + */ + private DrawerLayout mDrawerLayout; + + /** + * Expandable listview used as layout for the app sections. + */ + private ExpandableListView mNavHubView; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + //Retrieve the drawer layout container. + mDrawerLayout = (DrawerLayout) getLayoutInflater() + .inflate(R.layout.activity_drawer_navigation_ui, null); + + mNavHubView = (ExpandableListView) mDrawerLayout.findViewById(R.id.nav_drawer_container); + + mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.drawable.ic_drawer, + R.string.drawer_open, R.string.drawer_close); + + mDrawerLayout.setDrawerListener(mDrawerToggle); + + ActionBar actionBar = getActionBar(); + if (actionBar != null) { + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + } + + //Set the adapter for the list view + mNavHubView.setAdapter(new NavigationDrawerAdapter(getApplicationContext())); + } + + /** + * Intercepts the call to 'setContentView', and wrap the passed layout within a DrawerLayout + * object. + * This way, the children of this class don't have to do anything to benefit from the + * navigation drawer. + * + * @param layoutResID layout resource for the activity view + */ + @Override + public void setContentView(int layoutResID) { + final View contentView = getLayoutInflater().inflate(layoutResID, mDrawerLayout, false); + mDrawerLayout.addView(contentView, 0); + setContentView(mDrawerLayout); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + + if (mDrawerToggle != null) + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Pass the event to ActionBarDrawerToggle, if it returns + // true, then it has handled the app icon touch event + if (mDrawerToggle.onOptionsItemSelected(item)) + return true; + + return super.onOptionsItemSelected(item); + } + + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + + if (mDrawerToggle != null) { + //Sync the toggle state after onRestoreInstanceState has occurred. + mDrawerToggle.syncState(); + } + } +} diff --git a/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java b/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java index 9cccffb0a2..88e81c431d 100644 --- a/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java @@ -43,7 +43,7 @@ import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.maps.model.LatLng; -public class FlightActivity extends SuperUI implements +public class FlightActivity extends DrawerNavigationUI implements OnMapInteractionListener, FlightActionsFragment.OnMissionControlInteraction, OnDroneListener{ private static final int GOOGLE_PLAY_SERVICES_REQUEST_CODE = 101; diff --git a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java new file mode 100644 index 0000000000..4bb5cb686b --- /dev/null +++ b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java @@ -0,0 +1,135 @@ +package org.droidplanner.widgets.adapterViews; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.SimpleExpandableListAdapter; +import android.widget.TextView; + +import org.droidplanner.R; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Adapter for the navigation drawer items + */ +public class NavigationDrawerAdapter extends SimpleExpandableListAdapter { + + /** + * Keys used to access the group and child data values. + */ + private static final String KEY_SECTION_NAME = "key_section_name"; + private static final String KEY_SECTION_ICON = "key_section_icon"; + + private static final String[] mGroupFrom = {KEY_SECTION_NAME, KEY_SECTION_ICON}; + private static final String[] mChildFrom = mGroupFrom; + + //TODO: complete + private static final int[] mGroupTo = {R.id.nav_drawer_group}; + private static final int[] mChildTo = {R.id.nav_drawer_child}; + + /** + * Each entry in the list corresponds to one section in the app. + */ + private static final List> mGroupData = new ArrayList>(); + + static { + //Flight section + final Map flightData = new HashMap(); + flightData.put(KEY_SECTION_NAME, R.string.flight_data); + flightData.put(KEY_SECTION_ICON, R.drawable.ic_action_plane); + mGroupData.add(flightData); + + //Drone setup section + final Map droneSetupData = new HashMap(); + droneSetupData.put(KEY_SECTION_NAME, R.string.menu_drone_setup); + droneSetupData.put(KEY_SECTION_ICON, R.drawable.ic_action_settings); + mGroupData.add(droneSetupData); + } + + /** + * Stores the app subsections' data. + */ + private static final List>> mChildData = new + ArrayList>>(); + + static { + //Editor activity + Map editorData = new HashMap(); + editorData.put(KEY_SECTION_NAME, R.string.editor); + editorData.put(KEY_SECTION_ICON, android.R.drawable.ic_menu_edit); + + //Flight section + final List> flightGroup = new ArrayList>(); + flightGroup.add(editorData); + mChildData.add(flightGroup); + + //Settings + final Map settingsData = new HashMap(); + settingsData.put(KEY_SECTION_NAME, R.string.settings); + settingsData.put(KEY_SECTION_ICON, R.drawable.ic_action_gear); + + //TODO: add the remaining settings sections. + + //Drone setup section + final List> setupGroup = new ArrayList>(); + setupGroup.add(settingsData); + mChildData.add(setupGroup); + } + + public NavigationDrawerAdapter(Context context) { + super(context, mGroupData, R.layout.adapter_nav_drawer_group, mGroupFrom, mGroupTo, + mChildData, R.layout.adapter_nav_drawer_child, mChildFrom, mChildTo); + } + + @Override + public View getChildView(int groupPosition, int childPosition, boolean isLastChild, + View convertView, ViewGroup parent) { + View v; + if (convertView == null) { + v = newChildView(isLastChild, parent); + } else { + v = convertView; + } + bindView(v, mChildData.get(groupPosition).get(childPosition), mChildFrom, mChildTo); + return v; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, + ViewGroup parent) { + View v; + if (convertView == null) { + v = newGroupView(isExpanded, parent); + } else { + v = convertView; + } + + final ImageView expandIcon = (ImageView) v.findViewById(R.id.nav_drawer_group_expand_icon); + if (expandIcon != null) { + expandIcon.setImageResource(isExpanded + ? R.drawable.expandable_listview_icon_expanded + : R.drawable.expandable_listview_icon_collapsed); + } + + bindView(v, mGroupData.get(groupPosition), mGroupFrom, mGroupTo); + return v; + } + + private void bindView(View view, Map data, String[] from, int[] to) { + int len = to.length; + + for (int i = 0; i < len; i += 2) { + TextView v = (TextView) view.findViewById(to[i]); + if (v != null) { + v.setText(data.get(from[i])); + v.setCompoundDrawablesWithIntrinsicBounds(data.get(from[i + 1]), 0, 0, 0); + } + } + } +} From 4be6cce96f9897f8ace0a49e105246f6ff7ca82a Mon Sep 17 00:00:00 2001 From: fhuya Date: Sun, 23 Feb 2014 12:39:45 -0500 Subject: [PATCH 3/7] Navigation drawer ui completed. Needs to complete back end integration. --- DroidPlanner/AndroidManifest.xml | 13 +- .../res/drawable-hdpi/ic_action_circles.png | Bin 0 -> 1651 bytes .../res/drawable-hdpi/ic_action_database.png | Bin 0 -> 268 bytes .../res/drawable-hdpi/ic_action_help.png | Bin 0 -> 1357 bytes .../res/drawable-hdpi/ic_action_location.png | Bin 0 -> 970 bytes .../res/drawable-hdpi/ic_action_paste.png | Bin 0 -> 535 bytes .../res/drawable-mdpi/ic_action_circles.png | Bin 0 -> 1098 bytes .../res/drawable-mdpi/ic_action_database.png | Bin 0 -> 249 bytes .../res/drawable-mdpi/ic_action_help.png | Bin 0 -> 882 bytes .../res/drawable-mdpi/ic_action_location.png | Bin 0 -> 686 bytes .../res/drawable-mdpi/ic_action_paste.png | Bin 0 -> 361 bytes .../res/drawable-xhdpi/ic_action_circles.png | Bin 0 -> 2156 bytes .../res/drawable-xhdpi/ic_action_database.png | Bin 0 -> 341 bytes .../res/drawable-xhdpi/ic_action_help.png | Bin 0 -> 1848 bytes .../res/drawable-xhdpi/ic_action_location.png | Bin 0 -> 1405 bytes .../res/drawable-xhdpi/ic_action_paste.png | Bin 0 -> 580 bytes .../res/drawable-xxhdpi/ic_action_circles.png | Bin 0 -> 3317 bytes .../drawable-xxhdpi/ic_action_database.png | Bin 0 -> 424 bytes .../res/drawable-xxhdpi/ic_action_help.png | Bin 0 -> 2755 bytes .../drawable-xxhdpi/ic_action_location.png | Bin 0 -> 1975 bytes .../res/drawable-xxhdpi/ic_action_paste.png | Bin 0 -> 775 bytes .../layout/activity_drawer_navigation_ui.xml | 2 + DroidPlanner/res/values/strings.xml | 2 + DroidPlanner/res/xml/preferences.xml | 503 +++++++++--------- .../activities/ConfigurationActivity.java | 15 +- .../activities/SettingsActivity.java | 7 +- .../adapterViews/NavigationDrawerAdapter.java | 53 +- 27 files changed, 315 insertions(+), 280 deletions(-) create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_circles.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_database.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_help.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_location.png create mode 100644 DroidPlanner/res/drawable-hdpi/ic_action_paste.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_circles.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_database.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_help.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_location.png create mode 100644 DroidPlanner/res/drawable-mdpi/ic_action_paste.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_circles.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_database.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_help.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_location.png create mode 100644 DroidPlanner/res/drawable-xhdpi/ic_action_paste.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_circles.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_database.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_help.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_location.png create mode 100644 DroidPlanner/res/drawable-xxhdpi/ic_action_paste.png diff --git a/DroidPlanner/AndroidManifest.xml b/DroidPlanner/AndroidManifest.xml index c40f91672d..629132a46c 100644 --- a/DroidPlanner/AndroidManifest.xml +++ b/DroidPlanner/AndroidManifest.xml @@ -117,22 +117,15 @@ android:windowSoftInputMode="adjustPan" android:theme="@style/Theme.PageIndicatorDefaults" android:label="@string/menu_drone_setup" - android:parentActivityName=".activities.FlightActivity" > + android:parentActivityName=".activities.SettingsActivity" > + android:value=".activities.SettingsActivity" /> - - - - + android:label="@string/settings"/> diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_circles.png b/DroidPlanner/res/drawable-hdpi/ic_action_circles.png new file mode 100644 index 0000000000000000000000000000000000000000..de8a9b261c97f1daaee29a83c913d4fde36e0534 GIT binary patch literal 1651 zcmV-(28{WMP);}A|*wkF3Wnx-o;Rr zsC{V_sS-+pkWd8T1)g}RRPhF{R6HUf9#8^70$PxGC=!Tv1wOU9l*!4->j8{gmNl-bI{}<0xg;V>*=+XA%*@Qn(0MP#IZ!Hqxkbro>r$PsICaq-V2|3uPC81{i}+s99xI`vHw=XDj}y6yucCx?wQ#w?S3 z)c5^w2l=ks8gN~ADo$QiLz1TfEVf#$&r+$>)c|&@>J-Uebo@kQvoYo#08b2>XI$+P>J^~;cA%9jxj?K-@eH!=Qw{PEAE|)tjBEO5;!!SHntybUZH`mX)jgpi$*@K9X zH^!U?@OU@!0I;yI(5O@@Csg%REZ^Zy&R$saC*->BuK@fOz|D^1doP)M)|M&Fi(`S3-oSB(faU7>g@(&#w$=&?~4E+hYu4@;I#iN#G-3uT}9;*6z zHk;iUd+lf1L~d`jS`U{>r9YBnpDE77p2z#~8A?E*P`DPr-vHd!ZJgvXfLzRcp)Dv! zGNr1A3x&c%`F#GWZaFN=s>gC}>BlLtfa&S!9La}C?&{^Es@q7$7wRrmHHdr$BCGsB+m-_KaB%o9({YFIG9>cE#_-mz7IZ>4LUPVllZIZ z7b5a^&+}eM;tve?gr=sZt_#C(EN&N(u9vcI@O}S#08cxPT?cT6 zW@mLG7n%L01g~DkXc?{-jPbB&L^$BdZDj?bUJ-5 z48v9SAP8>gkQo+}lan`CmbJ$iQ*X6edtBGu4#4((|M)2R`U;qxovk~L(;^x78^?$O zEX(=}$(y2Y))@2FD7kL*=#O}NXoLTovJ!cvJAlP78i!$i`8oN-=mTT zhNy{~&F1szboxdBTjOKxBK!_jg>BnWd(V8TT3ai5V2FaIR;w)=W1ecaNY(^Z{T#rt zwdMgvXl%Kzn^o1jL}Yr{$y7DOj|I@b;x)vm7`Zc7C=@0{IBJsxVV-0HGXW7d@3TJc%JwEFm3as_*r|S`FuWYS=Kh&w!drN xLf0La~}U&Kt-LNE{-7? zjc>0XvfOice_)0+M#;te;OPWbQ8Q37n++h4r3MLmINCI$viS3j3^P6gG2hd@v*�d~<)zxl5{wZU%Qcf%RfjK&P=OpwrkC&}nqN0DGf| zMn*=Ss8*|kBC-#_Qvmvjs83aw0NexcCo|8cQmNm^$H)KKsJOJ=lh}3LT_SQ!RrfJ7 zwX+uyC8Ako{-IDP+*wy}tV4h?rk9A`6cIO`xT^lGs&@d~Bcdf$?Zbo7*hNI!<3gCZ zpsHW{zQ6of1spthaG+MJy-P#`v1G0WL6D!Gp1$48FPqKowk#_rB8MZ^M#;lgYdhjfRMnMdZU`u~>d20*HvS+3fqwyc+;S%*HL_c`0M~U7tLj@}_lEEL zXSL3Gbad2ST3R}ys;?1II{urgE)dZr&+}&flK>GJW6l8B8}=_23Wcjl1tdDi9LGtC z$k8y76=wdjK6wCGTwFW>;8=a~VPXRS-ZRF$SSL(Fz7+rvk)w{|q&8GQCX+ctMBBpd z<;ls(zv^vV*L{weUy1r6@>8u=`$SbgSJn6eKQ%TsX2pF&zRLhWMB6f%%%KexAR;dV zfU4g0eSf@(&F)zD#?;i*rDCyI@_m1DWo6~FXkHW1wz;{vfqH-6_s3QBZam(G2*~Af zX(HMa2LG*@oo(ACBDz3C7c9%V82@c%W@ZV%T-3KLYn6aFKN0Q8<#Ma0VZ*rX3@Vk% zPTRIE01%PcW_A-36Y~J(nS-d{89w^O z^Sp0c`PA_z8tt|M?%%)v@Y}?;?I)9v0)VQ%&dkq;?UL{NU$ygz^T*@1LR$gpbb4M@ z0{~#=eMv||JR56&pXB={;#bumolZC0(N_7iGsx%j6;-_%62Fv$6aa`QP}O-=oezQ_ z(e4%TtLn{sK3_@Vlc*+U=3fE4Ktwx?F(b`R<2ZcZ|1=4A1Y^ty5$%Y@ON2zbP`O;b zuBwY+_xOPW2NJJ^BnbJA1AwY7mdoYqNqrLuD3wZ8X1)RdM6^{zP7zVd0^S(&u`%YH zG3Hz=!9+wM-&O!%<|}I{kP@E*p66W?k*MU`o6TlN+qm=)kxfJ`r)kKu7kE(6c%FAH zX->cz1gNTr$axWowzsk2;o*}lzTGRTT2a-CWm&6g2gh+z!^6WT0gQ#omqq0KTB`vZ*q?~4$MH9%2GXaansTWW#Dlh=EzP`RJA`-{(SCU#t9-nWawY9aCAP8=f ztOB?!BEi^{k~{#=OVjlA&d$ykUpc)90AL!8#swYg{T7|sHWF}DCr^e6d4RjsO8l0PPm z17M6Xw_JJTS$`9s8p*dyOG^)AfRnJW^r!KY`F(<-F0D!Mkh+NCs+yIQKUUP{#4Nd~AwSAKREfWzDW6W~B zUf%-nXNdtoyj8jX7Zu1>P6YR?$+Zrr{;?Q2bPKS`4N zEOtAuE^5FJ=0MJt@+0EGIY%h~u~~BF|m@|HAWeEGOhT z%vCCtS0tT}!z8~~DwS7xIOGx#MbSuAx5aHKrK-9eMbRh^hunYaJDpAsz@vHn06gk+ zI=#I4y;LPytyY`li<6Eg`J&ZowSDCFR#vgrJ|+2i);N-%t+h{m<@F|jq>_Amf^m<1 zmRP(Nwyd>#s`_Sdr~}e4r2kK@j{$HmlDE3K0;;ai8SD@o$m`dCoi2P*{1LWH+nr8%5p^^d_{uqA&ra zQfWV{?Hh#&Xt&$nNd6@Gv)yigD=JTsdw?SHQA9qnz`NYSu9!qbNPZ|XzDU6WN~O|n sk?}=5-;pf>r~aDtOu(XXCScL{4JWgZe-*I{bpQYW07*qoM6N<$f-eTR761SM literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-hdpi/ic_action_paste.png b/DroidPlanner/res/drawable-hdpi/ic_action_paste.png new file mode 100644 index 0000000000000000000000000000000000000000..07edc1f4fe94c946e1588abcacd3985e0a7ca515 GIT binary patch literal 535 zcmV+y0_gpTP)biM2!oh-ig~M{DiQTDwEUW4{}* z8C61MS-yu%iiiLJU%x(k3Z2JV`#KaOat{CiIOm?rvV7~WuTs$w6F@`-058{Tsb#_i z?rp0vW;BpNKzQ@?)0RWUz3nJPWV+Lc#z!nHez9*&x zOJGX!J+UNM0#lRk=_NQhumm{C$C`uHM#mg9(#-y8Gz+ALbq|a=HNE%Whr?mZS?3Wf z0q5L)C`N02^N}GIEP=LdKVl^^74Z@p1E(E}myk5MghJvaI?|t(kVHqyB{US153&Jr z330|d=l0wmA?ZO@6vc@%9^fC8(Cps_vOsFGKx%@!P^_1jSj>J0W-p-fUkwtI1yVD6 Zfgklny3rsh-!uRK002ovPDHLkV1h9v*46+3 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_circles.png b/DroidPlanner/res/drawable-mdpi/ic_action_circles.png new file mode 100644 index 0000000000000000000000000000000000000000..26527935a4b712bc6dc52d7142de0fd2c8d469e9 GIT binary patch literal 1098 zcmV-Q1hxB#P)o)9Ay;#zBjv@MvPRfNn2{Fo0E}d&Cbqlun3I` zQZI_o3f_u>1#ezNRH`1l>P7UTD1un@5-9LHJk zeSgK;6d89~gr!pHfSH{Vk;AP%Gn;c9=S|=DfB9bo6pO`@h@2vs`XtS)W@fKVPELM( zMFk8D3|ybf<<5}ojE<&M^@~QM@pDH<$H6cRkBP{w0HCTDNIo9~!A5JIZP!39mwTv5 zPV&9+@$qvp_X>b7UDth3MD7)ly=L|RfOobfV0d^qv%bFG4`6^~e?Fgo7C?XGKEJlM z_E}O~UtizI{QUgwBzs8SmV{~h6BG)C?rb*u7|BBbU}nnzUM2Zl1Q`KvU6kwnAPD}9 z$Gfh3Qbg_sfO@_DM73J|J?`Ih4tSn7n9XLNZjwi~;W$oLa}$Q)Z)Ua^z%c;NR4SDl z{zV}2YjfS%*?Da%N2-8Aq0nt+kCNQeJTo)J-#xylss;cgdjWhKt@o?yBP1mjb4zr+ z===W4mIY)onTO-;WoF-nVfa)K1aFOvjr~D#HM+wg0Nn@1ivV6%)#+lf*l%X1Ns6kP znT;lKB^F_+R60TOo`_rlybuJzQUdNY$w2^6RU^4fa@EXwNOs3=;L{)oE^EQmCjg)~ zw*Eee8~|#y+8Y2qQB@NWlH3pANRvDgKbp_y&!+Gs&w+T=o7sHDwQc! zt(e(i0NntV04%8L=TlQt3u*DG0sw3PxF!kU00D>Uc zlsr{{sxFAgKH#4=YG=h_@u1^4XTmUS<~R#rzFk~e4O~(#B6~g0JK8Q0$-CnFMx!y? zE+$m~$r&>Xn|m`mF*G!ECW(kgpN#1OnkT% za$u8DY-XCtWL^RARf4!Zt>k8=W_B(Jf{(UJ4s7v@$n(6TW_B|EVrn5@RMofJ_58L4 z06?i!%8JNMX4VU!S5<3fwwTN17Jc9UDVlo!*>?O@yi?otKPFcN?7D!z0N#MQ+B}4U Qy#N3J07*qoM6N<$f&jAa?*IS* literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_database.png b/DroidPlanner/res/drawable-mdpi/ic_action_database.png new file mode 100644 index 0000000000000000000000000000000000000000..f4889e311b845be081b30e01969915340b376f50 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*MqE{-7) zt#79u>#dFAduK*BT)Q==xbI9g+k#a`@1CB`@acEF1Mf;j lQb z!b)v~gJ5xgfM8)GrbwZUe}vZ_+FTnnNw;KohG7r3uo5;94uk}BwHRmTJ&T)>&3dz! z6=f~%(+s@#zVCf_Z{81@8I}oIYV=D2mjnQKix`s>-}i3;xB;LgA}s(=)e(Rv07hAs z4b4nn+ULu*VGsn@% zMP!ZScm00~_1)YhAnDenUjs0Irk#**W*H&PW``8+o4J z6_FJ)`)Xb}8oPj`nArh?)55YWe=W=MTUGrgP1DoiaQK^uJgU^M&iJU`-arH9&4CsGIOj&w z!ogth6u{GInW|m~05kh(TJD@1sp?<8&O>u;&eA`wf2=07+wH5W`o5|f$rrNK>-Cr1m>0CN%h?Yke&P3^S%av!C>%9gOA-A zUw=bm2C^(0R%O@x3}kJbzvBGNN%a>D9f_p!UW7rNge_yRCPa& z<{9 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_location.png b/DroidPlanner/res/drawable-mdpi/ic_action_location.png new file mode 100644 index 0000000000000000000000000000000000000000..c952237109a86dacf64b9723650e11a4d04f71ac GIT binary patch literal 686 zcmV;f0#W^mP)0+ox>f+5=j|I~4y;9uIq*Dh-zL^-5gKEjrhSrz09tYP8Oid3oc>AxB$Y`f`_su} z@}}48-2p(QQu$ac7GIOxO6J&TFP#GZsJxv5x|kOSfL^b6C+Q-Uy3HhYUI0lVd7E++@|ubs}uM(~++x>qf002O;zo@-70AoylQG0Cw zolfT(z&(KbxV>HgNs**M{6u+mavjU(W{gRn0oDr;MbY3-0W#eS{)TP*YW5%CJM%d5 UBH}f5ssI2007*qoM6N<$f=;P4zyJUM literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-mdpi/ic_action_paste.png b/DroidPlanner/res/drawable-mdpi/ic_action_paste.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3782b4ce001ccc7b5e8966a73d857f2a5a757c GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt<0yT^vIq zTHj7T$a~0u$2GS*@Wz2xVsAGZ7bHvMojI^JwOd2l!21j*=fW0?bzO{K-!LfkxtIuE{K8;(RkL-&>s_0f9z|yl5eS^Wdv?&SV-nAwZ=N;TSF+-|3`0XlRhnE>)+)xV zvug#i7<`LQ$Ch$)pswkX#Z$L@(T1%?8*VgC+H&Ck;|5di{qGN$v083D zu*>?vzAp2IEViidg4K6qHU5d$c)jD>!F-3&$12I|tjon6Kp!)By85}Sb4q9e04r{d ADgXcg literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_circles.png b/DroidPlanner/res/drawable-xhdpi/ic_action_circles.png new file mode 100644 index 0000000000000000000000000000000000000000..7206a3ae398a464b7a40d9a0c4848a422f73df86 GIT binary patch literal 2156 zcmV-y2$T1TP)p$0Ya*fDiBdY&=F4A%vi2ZJGHErPS|=#p2{f;|4AO5s{{8X#j_W5D_nZ zl~NfZ`i)^2%WcOGQUFcUZV*B|Kt%oR`cO(;5<)zg&*!Jx=^vN?u~=+-M@PrE09@yX zKc&{sv%}*P@7ek@Yli6(czc&5CN~ybv=l~I2b@PM}-PLOKGXQ?#h0D9X1Y)t+_DCf1Z6fNd zGgXM_xA}bjuiS!^uIqb<=<@*HUvE=N9WN9L8Ml1i^(7FAMDDd2JWSL4LoS#5ORK>H zfMFPCrIbIlTM|Nu!|8O|^~}CzOF-B49ZIQwBI*Os7mY?AUszZ$0mSOtGV@ENQt8iL z{AV(mbBRRaX(BpQXS!}_Y3ViqFSzmJs{p#LhlLPBN~!%sv|CCE0AS|D@$vChUDxj< zq7Iv`CjcOoN<}l7%)Hxp#bWVvB9Ztg5naFjIy1-MQUKqUz|hdp0Dz;+`~VT{UT-6! zi`MTgHeHtu!#JNvByOr!tB>lsesFATOuC85%nHE2ZLZ(!miLAQNT<`Cx~@M6;LG)Q zVjZE2*54i*^Be$J%cYZu?wy&L`DQ#G?{!IG&L*B+99wKifYH&>t&59`UnioWX6=~y zEdWqTZLu+5008S*QNxZaP*e)>i#$Xj_0-EVg}hb@gEYeXZIG zA-XMMOZ7Hp?zL=h)b}w>^Q)Ss-Ow}Xx4_A ztIT|=QmH&#C=`BCDwSRafaT@oe*&n~w-1NIhnZOkA&%SGg%CIN^z__Se_hkGw8Jc% zayuT+0ua$X%?cLGya3>F!!S-yPEKC6=BKBp*O<9s+e$r1c08U0NF)+_0o?9nXXcAi%I_J5an`9#rBeC5Qfke{ zG?q*zhYZ7*i$sp;uyJO8%u zv>DQM{lR7_kC~4(8~i#yX(GDM!CdU<=s0oa%$bD-vP44Dw1Y%+HxV_w#WM2?hGG1$ zRs5@bx)s0*{)1Xdvk9Iz4C9wBeNiHj_!<%2=HRPJM6WBQUL~T}i0FN|oGtp`Ttir{ zR;x!#rIPCm0C-penx^e`8a#l?+S=MFx4xK}rIf#7=2bhpb$9!O5c{o}auAo7o?`)p znSbqd@PM~xz@8?-XQ!s7-u4pMDtLU~F7RW^Z9(Ko%n!y=V>I(-=mg+kN0TyEA)<;V@Z2+**R zsX+*FBY+n-PUp(A;WNgSSyT-jC4sU zKi7oA!p@yLpWjG~dU)CmN-6)*%x;?Irw0cIT^A(RgNQ`ATz&|EWAz6>_TI`~d+|FmGSa2%`e%g@A8yjD0$|*WUpMglZ7`Wke$X_{ zM_QfYaC3Nph-h$daK8}Z9v79|r}FvyGoHx0KwBS26N$uOA;ia8wNpwh0XU1xwfk2) zIy%m+tgJ+(l($$9y4%rw%GYpy*REZU`aS)DHU%Ieq3ilr(4;!#7nD*TU&cVDfJ(}3Dw0ZheDwrU8}(Z8~89XIXSr$4u_91bHleeKfuh3MD*iq zHal}I{MWGI0}|kS2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4XfNMuDZZLo^H}m1x!FCPzf+&*aNdK7kGJKvpPaL$VHrb|LokEx z0?h`o3nC8O8C(lkO;|55&HBiA?!8RZw5PkapO9Pgx~lT)nIF;tKy{U`r9Yh5T>gFa z{ch{W`3HV5$lEu@?|*b&qMo_$uegLCBhX00FT4}$7Xb~vEO7~Bl9V%)$&|t9oBTpr y>AwqD*%DTh$IK>eARRy^$X1X7kQ9=m?l6c>)zJ31z9a(ZI|ffzKbLh*2~7ZNs(Y^h literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_help.png b/DroidPlanner/res/drawable-xhdpi/ic_action_help.png new file mode 100644 index 0000000000000000000000000000000000000000..1b8ed7e62c5c96927a84aa063a612c58cd168e51 GIT binary patch literal 1848 zcmV-82gmq{P)*`qH%X; zGBL9~RUXnaytF$r{d#9@VdsN^_g=rM{$9=dsjAl~BCwf3NfSsK0|O*YAZZK?kTij$ zF)%>V1d_(U07(-_8b(qtwrx8N0NaA`Rb@Bjeia`}pBn#V+B zA@t~Az#%qb&wyaVdsSWY%>3mSv41VgUdE z5r;FG%pm}HKh8K}&4A#XKdLlcHBIwasZ{#AlT4vd$YitGrvc#c@Xj8>s)&5OyuAG7 z;^N}1wK}-2o2%7ouYj^AF!M)o`~>Yi01+v0a#}BzR4R3%+u#8JhK7coBcdmJ3?2X= zjfhVT4-X&g)S*-={hdmsPB3%(-y@=DbiGZ07zVIydp{_aC!*Sm z{QM6RtUa6Fxw*MTQ8u7p7JZ@iW9GZY#>Uokiva+FcdG{46>y9UEd%89`J%ech-ki- z%=q~Du!vj{k)KMYYB+RLrVG9)~#DF zcIyw&{+EtL(Z9O7iiTl`>h@+bnXa3rX_^M5Sw#S_)HWjeDvE4~OFrNl2|6=iTd2OgX0I4<9A_sY9u9@P zi|5auFGo}n<`U-G5s9b8i^bx0-}hfovp^#9OD2=~XrqEE6*>lpZRJkbyLa!FY&QE6 zB5rTBiOBD{T<*i^>FJvqs$$R1$OZ`V_Vrdhochwm*w|P$old_9cLp>|sZ{ENGiT0J zb##Te)OGF{bdSL$r99fLZ!e6Dj68ve_qXansQYoJP`C%LQKhVve$zb$+h;N&?si=_ zc0Pfb?+Z13<9S{u53wU$*EJAv_gWmIK+6D#_`Ooj)@rpqI`SceN=dKiv&bm5|Q@RS1Of?WdLR#C%XMViU{Alc~dJXqMZ@4 zZTn?J91C9FVCL83roGpTiHV63B6>>+hZjB1drwD4oQ%-fwlGn~FpLAbI{F2}Fb=30 zCY4)MXwQJ)((?@njxT1GbUOXEZW`QioI8%up`oF=PH^Qo&d$}<)z=j7@v7%}Z|XWv z+A}~zn3+$t6%b*w**xsJZZ4`0+qToqX7gS3cjLy5LR5Lzb#u*T^A6XUnNP*>9Amk{ zv$L}m5xJ~1?Wk6(N8%(Ub%BUftyYhK;y{VW<+wM;u?aUCjgx8=hKPm9$;oFo(g>}K zk=C66K>K3kWL%xG$yO?rzli8~a8Y?%8PQ{wWgXR74pHH{ZqBl-qoG?NpNNjH=em5; zUycs0#|Ixs3_g(=d?eLxowpTl=FjB9*pwei_QIz6RQCUj#M9zQV_<-!2_%hy0g@(= mGzJDpnn2PR7$9i^N#h?0000ZEV-s~zhu9UN6|_+klG@lA-@^jC za)RTTByVPrlCv7myK~-|<9ToH`xpj5M;Xd*0e<7y0KWzJjbj7+7T`CIya53}Dov$Q zCmM~$DG?cJHk(`ZdVQl(sWko2!d~P7>2%syUS1woO1(%#FEI1T-7x^}6H!?yRm$h{ zH{el%;;I46%#)LoQ_OsUh#qlzorv6K=5I{X{KYkK9k^z|?Ck8xMx*h%QtFw5asVi9 zY;0U{vw65;z{JGFV@jzvnfdf#xd5!TTCESu%CH` z^k>iMDiKwurlyJjE)kL4BmV5!vuDG)asw?*z%Yy_9aW~(=eutHA#%Cg3K4y0$HB~j zXf!&uPlj`K%h_N+^nH7K`2VC0@VjMw>0ZOSYyBKCZJv}`=Fg;EtlTS0VZO3dF z#^!$X4T2T}M8uJxcDw!BUS;WY+7OXfo$y$eWox)oXfXi59Vci8=d49@A~)MkKbn)gKH zdtH3}0O0HS`T2%UPOb9+%zTZA?&;+0!LN&pi&@>IS`9Ewb6Z5d(8)>kZ_jTS#;0yf zm2009EEEc5BFbr|y|%Ehu&SAph+JA41MrE6+|t1%BIQD%U^_}YC|oh1(-ba~gMrN; zh{)~X;o*yN8Vn8;VT?5cv zPFwXl`|E{oyT!X5Av0I)V%>yq1}LRgI)^I*1Krl)W8Eu6L;#Ma0qg7QH6ps>#kAKT z_+~(*QfVrsKJcslEOac?13dGamiQzAly>00000 LNkvXXu0mjfReO$| literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xhdpi/ic_action_paste.png b/DroidPlanner/res/drawable-xhdpi/ic_action_paste.png new file mode 100644 index 0000000000000000000000000000000000000000..486940ed6199ee799093d83a9dff525edd34d18a GIT binary patch literal 580 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 HkA(jLA1*It literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_database.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_database.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a3e54972611b4891c91ddd2a7e5c5edf7b7acb GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4x$z#(uW`B~!YUHj7JeP6#VxB8sbX%-~aH?CyA*uMAr*3~h|_A?=d z+5csW`8apqbWWg=(SH_QF=B+PUkVdFm=6+x- yJEX3JaOazrWHpGpp*nAJ9``{=BbkiVU->+R8rf;R0n)%wW$<+Mb6Mw<&;$T~_>C|C literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_help.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_help.png new file mode 100644 index 0000000000000000000000000000000000000000..6a27671dbdd80cecb20eee51d6e9b1161ffa3e34 GIT binary patch literal 2755 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 literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_location.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_location.png new file mode 100644 index 0000000000000000000000000000000000000000..1096807e88a7ef37c85da31a1d9e82a35791b986 GIT binary patch literal 1975 zcmV;o2T1sdP)^ALVwniF zbuU4x_>d4cATGE7srOuRgZK|XLXcKMNT5K~ixk=ds!^$&^?G);No@(qI5^b(2%*#; zxLwzt_u-PB2uvj)FqMG7R00B14_!bSL_{VhC+|?z;{c8W7!i?m5m^VY5k=8%;1W|K zMehYoO-+3~Nst6zJDnxcK`xkZJoSB&k))DY7V0wD`BO>y7-?{w|k(1lo+Yg1x_by;>Z|}>8wG%>+ zB*_=7wI2$R?e!NiJw1Joh%vor9#3TvOF60A@)plkDbD zUgp|d@cQPXs-H0?lk?W@?(VOyUcI{A`=E%3we~@hUlEbpTqZWg+}&t2PRDV4D@%cC z@g~4pd&(Gdx64?Ps;U>`IF9=KoB;mRXf&3LF^`JKM_qF2_4)*WKe~){#oJ4es(#9K ztcX0*@0Z_89LKj*^)Zs_l9Q!ISG)-@#<=$NUpaH;%u|CNAII?xlD~J!a$S4Kg3mYM zJ6#5eNR+l|MsnUIi{x>aaar&tfTYs`i-_DvJEqg=ysoP6IAk3=ckbM1+HqO%Ccw4V z-|co^O*@998e?8}$r~FRyTfIiD?SD6xQsh??AU3?NT*&?x7*F*nqpvlz65Q$j8oOr zOO%a9<1~QOtp$?0w6wH+^pW}DQ^1zvxQVo5_CL?N@NarvBJ}ww$mt9ak^82mrXC#h zcx&w`Rei)I3yw8r!RHyU;W}1TzuIUtj(jPanVA{GyGxu-?FazQHM-*SLTuS}tccuZ zjQO6m_KW>m+1A?ox3;#vFCzD4$Z@XGIn(D$p0)OeB62dz93mO1tXo+Np`=P`(6UfbVTSXfxgI!Ri5uS~t< zIWG;1zCQs0o(05lyh!q<&&)wkRn}^?=R#zA6+lu&WZ=%GN8)C)>HXyg2(Tz0MbUz) zrta?y3st3vTn?4*T>wcMW1jGxdk8N?QS@4<@F3em78Vv3RrUE0*}bUhtOQWgTCLXgK-upRbcb4} z(^*y3U--@?*=e`izw@1Y5W%+y#&LWFz#n|&kzCu@*myj|Mb|+D7XScJ6g@$5Y1la= zw`#T8k3+xi_fiM}Bsn@d`qN=vC6i2&B>Bnw{QMik%5b3&0svrcZtm@Rz5XKrL%Efd zgC1*)x!!Cxy>Bse zr4$0{_4?HmhYu{P2$Vv=egp0AgB+XYY$*bz5C8xqUmW0=wJ3`I>7$;!D2)JBJ@T1d zwr4+3A^~w6zpAQ--o-vLGIHcuQZz~<004|JeV^f~dMniKwk(uN0D#3qepcj-zkMl{ zfbsG18~qk*L}b--Ik`|O0kgBST@g8O-MC(_uX-*g7fK}nIQY(alHK|F`Cz;3vQRn! zs=9i>!#9eu&nGRV6L8QO;PQPEMWJ*8y4~)}|J$BUlB5#gi^avocL2O^Kff_%HB2?x zDV+cS5Rt$A_unM9%GUqsrK|#0dj1=Hi+L7GDZm)>o&b_7haFpVN-3b(Y~EDWZ2(Z! z>I?|P3dy8atF4AEBnzebJ7T>UW0q8Pq}^^8cH7|~lvcp{`uddPY|q002ov JPDHLkV1h%ms6zk% literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/drawable-xxhdpi/ic_action_paste.png b/DroidPlanner/res/drawable-xxhdpi/ic_action_paste.png new file mode 100644 index 0000000000000000000000000000000000000000..e194cb41975207ee85db1da96b600e23a53a8384 GIT binary patch literal 775 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR40I5w^j7Ex_lp^8&0nzU zl&;|9aJ{X-^|U?Y-+oQ`F6R%NnNf0&YVXf3V6ttP?#GzG#SqLegXw?>!!iZ~)`q={ z*gu54dsiA8Kl7$5$HTQVBd?d*pLz4UZvX#l;@?hP@|JpEw6i8S^s04v{GYeKYwz33 z^dIkUKm73d&f{ibhS3vt|NgJ`zvS$rlHU2nIp+h`ZK+oToG%-a{i;ju1H4b<+lGXuAjPK$@7MVr?=(4 zJ+GcvY3o%uu|Rrl&+H) z<2loxfqsG?7@p7jqcNQ$gCXnFVi~0b#uq31UvNY;$f(&ng)4sTernFzkhpzu@ZQBC zR%?+$S(CwsG2zDRhAHp2+C8_8pA`n;?-FIa%+;XDkR!HyfyfHoKy6Tr%xy}DVg$y^ z*&fOGlW`imf4KFbwmfQ{K~!P-0Zu-OVxP`vs%8erIq z6yY0A<{x`naNj;1YzNp?TnyT;=2xDZ2sR5zDbNjnnGV#?4ha<(Oa&%d22WQ%mvv4F FO#rK!Knwr? literal 0 HcmV?d00001 diff --git a/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml b/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml index 5c8ec633c2..11356aa8ae 100644 --- a/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml +++ b/DroidPlanner/res/layout/activity_drawer_navigation_ui.xml @@ -13,6 +13,8 @@ android:layout_height="match_parent" android:background="#ffededed" android:choiceMode="singleChoice" + android:childIndicator="@null" + android:groupIndicator="@null" android:layout_gravity="start" android:paddingTop="10dp" android:orientation="vertical"/> diff --git a/DroidPlanner/res/values/strings.xml b/DroidPlanner/res/values/strings.xml index f5311a7c68..6c92805f1f 100644 --- a/DroidPlanner/res/values/strings.xml +++ b/DroidPlanner/res/values/strings.xml @@ -351,5 +351,7 @@ Please connect first Mode 1: Throttle on RIGHT stick Mode 2: Throttle on LEFT stick + App Settings + Drone Settings diff --git a/DroidPlanner/res/xml/preferences.xml b/DroidPlanner/res/xml/preferences.xml index bca851ed98..e9ec385d13 100644 --- a/DroidPlanner/res/xml/preferences.xml +++ b/DroidPlanner/res/xml/preferences.xml @@ -1,278 +1,281 @@ - + + + - - + + + + + + + + + + + + + + - - - - - - - - + android:key="pref_ui" + android:title="@string/pref_ui"> + + + + + + + - - - - - + android:key="pref_max_flight_path_size" + android:summary="@string/pref_max_flight_path_size_summary" + android:title="@string/pref_max_flight_path_size"/> + android:key="pref_guided_mode_on_long_press" + android:summary="@string/pref_guided_mode_on_long_press_summary" + android:title="@string/pref_guided_mode_on_long_press"/> - - - - - - - - - - - + android:defaultValue="false" + android:key="pref_follow_me_mode_enabled" + android:summary="@string/pref_follow_me_mode_enabled_summary" + android:title="@string/pref_follow_me_mode_enabled"/> + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + android:key="pref_connection" + android:title="@string/pref_connection"> - + android:key="pref_usb" + android:title="@string/pref_usb"> - - - - - + android:defaultValue="57600" + android:entries="@array/TelemetryBaudTypes" + android:entryValues="@array/TelemetryBaudTypes" + android:key="pref_baud_type" + android:summary="@string/pref_baud_type_summary" + android:title="@string/pref_baud_type"/> - + android:key="pref_server" + android:title="@string/pref_server"> + + - - - - + android:key="pref_server_udp" + android:title="@string/pref_server_udp"> + - - - - - - - - - - - - - + [] sConfigurationFragments = new Class[]{ + public static final Class[] sConfigurationFragments = new Class[]{ TuningFragment.class, SetupRadioFragment.class, SetupSensorFragment.class, @@ -43,7 +43,7 @@ public class ConfigurationActivity extends SuperUI { /** * Holds the title resources for the configuration screens. */ - private static final int[] sConfigurationFragmentTitlesRes = { + public static final int[] sConfigurationFragmentTitlesRes = { R.string.screen_tuning, R.string.screen_rc, R.string.screen_cal, @@ -51,13 +51,22 @@ public class ConfigurationActivity extends SuperUI { R.string.screen_parameters }; + public static final int[] sConfigurationFragmentIconRes = { + android.R.drawable.ic_menu_preferences, + R.drawable.ic_status_rssi, + R.drawable.ic_action_circles, + R.drawable.ic_action_paste, + R.drawable.ic_action_database + }; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_configuration); //Check that the arrays are the same length. - if(sConfigurationFragments.length != sConfigurationFragmentTitlesRes.length){ + if(sConfigurationFragments.length != sConfigurationFragmentTitlesRes.length || + sConfigurationFragmentTitlesRes.length != sConfigurationFragmentIconRes.length){ throw new IllegalStateException("The fragment and title resource arrays must match in" + " length."); } diff --git a/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java b/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java index 6b422a4b4a..a558dc163f 100644 --- a/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java @@ -1,17 +1,16 @@ package org.droidplanner.activities; -import org.droidplanner.activities.helpers.SuperUI; -import org.droidplanner.fragments.SettingsFragment; - import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; + import org.droidplanner.R; +import org.droidplanner.fragments.SettingsFragment; /** * This activity holds the SettingsFragment. */ -public class SettingsActivity extends SuperUI { +public class SettingsActivity extends DrawerNavigationUI { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java index 4bb5cb686b..481793d6c9 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java +++ b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java @@ -8,8 +8,10 @@ import android.widget.TextView; import org.droidplanner.R; +import org.droidplanner.activities.ConfigurationActivity; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,11 +47,17 @@ public class NavigationDrawerAdapter extends SimpleExpandableListAdapter { flightData.put(KEY_SECTION_ICON, R.drawable.ic_action_plane); mGroupData.add(flightData); - //Drone setup section + //Settings section final Map droneSetupData = new HashMap(); - droneSetupData.put(KEY_SECTION_NAME, R.string.menu_drone_setup); + droneSetupData.put(KEY_SECTION_NAME, R.string.settings); droneSetupData.put(KEY_SECTION_ICON, R.drawable.ic_action_settings); mGroupData.add(droneSetupData); + + //Help section + final Map helpData = new HashMap(); + helpData.put(KEY_SECTION_NAME, R.string.help); + helpData.put(KEY_SECTION_ICON, R.drawable.ic_action_help); + mGroupData.add(helpData); } /** @@ -59,27 +67,43 @@ public class NavigationDrawerAdapter extends SimpleExpandableListAdapter { ArrayList>>(); static { + /* + Flight section + */ //Editor activity Map editorData = new HashMap(); editorData.put(KEY_SECTION_NAME, R.string.editor); - editorData.put(KEY_SECTION_ICON, android.R.drawable.ic_menu_edit); + editorData.put(KEY_SECTION_ICON, R.drawable.ic_action_location); - //Flight section final List> flightGroup = new ArrayList>(); flightGroup.add(editorData); mChildData.add(flightGroup); - //Settings - final Map settingsData = new HashMap(); - settingsData.put(KEY_SECTION_NAME, R.string.settings); - settingsData.put(KEY_SECTION_ICON, R.drawable.ic_action_gear); + /* + Settings section + */ + //Retrieve the elements in the settings section from the ConfigurationActivity + final List> setupGroup = new ArrayList>(); - //TODO: add the remaining settings sections. + final int configurationFragmentsCount = ConfigurationActivity.sConfigurationFragments + .length; + for (int i = 0; i < configurationFragmentsCount; i++) { + final Map configData = new HashMap(); + configData.put(KEY_SECTION_NAME, ConfigurationActivity + .sConfigurationFragmentTitlesRes[i]); + configData.put(KEY_SECTION_ICON, ConfigurationActivity + .sConfigurationFragmentIconRes[i]); + + setupGroup.add(configData); + } - //Drone setup section - final List> setupGroup = new ArrayList>(); - setupGroup.add(settingsData); mChildData.add(setupGroup); + + /* + Help section + */ + //No children for the help section + mChildData.add(Collections.>emptyList()); } public NavigationDrawerAdapter(Context context) { @@ -111,7 +135,10 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView } final ImageView expandIcon = (ImageView) v.findViewById(R.id.nav_drawer_group_expand_icon); - if (expandIcon != null) { + if (getChildrenCount(groupPosition) == 0) { + expandIcon.setVisibility(View.GONE); + } else { + expandIcon.setVisibility(View.VISIBLE); expandIcon.setImageResource(isExpanded ? R.drawable.expandable_listview_icon_expanded : R.drawable.expandable_listview_icon_collapsed); From 7cbdcff73bd343bf9c84c999b5451270c2cbf4fd Mon Sep 17 00:00:00 2001 From: David Zumbrunnen Date: Sun, 23 Feb 2014 22:04:04 +0100 Subject: [PATCH 4/7] Renamed HUD to Attitude Indicator (AI) --- ...gment_hud.xml => fragment_attitude_indicator.xml} | 2 +- DroidPlanner/res/layout/fragment_telemetry.xml | 12 ++++++------ .../droidplanner/fragments/TelemetryFragment.java | 8 ++++---- .../widgets/{HUD/HUD.java => AttitudeIndicator.java} | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) rename DroidPlanner/res/layout/{fragment_hud.xml => fragment_attitude_indicator.xml} (88%) rename DroidPlanner/src/org/droidplanner/widgets/{HUD/HUD.java => AttitudeIndicator.java} (97%) diff --git a/DroidPlanner/res/layout/fragment_hud.xml b/DroidPlanner/res/layout/fragment_attitude_indicator.xml similarity index 88% rename from DroidPlanner/res/layout/fragment_hud.xml rename to DroidPlanner/res/layout/fragment_attitude_indicator.xml index 9ac2ab54c7..65d8cd9219 100644 --- a/DroidPlanner/res/layout/fragment_hud.xml +++ b/DroidPlanner/res/layout/fragment_attitude_indicator.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - diff --git a/DroidPlanner/res/layout/fragment_telemetry.xml b/DroidPlanner/res/layout/fragment_telemetry.xml index dfb1cfab5b..84354b19b8 100644 --- a/DroidPlanner/res/layout/fragment_telemetry.xml +++ b/DroidPlanner/res/layout/fragment_telemetry.xml @@ -78,8 +78,8 @@ android:text="@string/default_angle_value" android:textSize="16sp"/> - Date: Mon, 24 Feb 2014 13:31:00 -0500 Subject: [PATCH 5/7] Completed navigation drawer integration. Updated the app menu accordingly. Turned the 'HelpActivity' abstract class into an interface. Help dialog is provider by 'org.droidplanner.activities.helpers.HelpDialogFragment'. --- DroidPlanner/AndroidManifest.xml | 3 + .../res/layout/preference_config_screen.xml | 72 ++++ DroidPlanner/res/menu/menu_super_activiy.xml | 12 - DroidPlanner/res/values/strings.xml | 3 +- DroidPlanner/res/xml/preferences.xml | 4 +- .../activities/ConfigurationActivity.java | 36 +- .../activities/DrawerNavigationUI.java | 25 +- .../activities/EditorActivity.java | 4 - .../activities/helpers/HelpActivity.java | 50 --- .../activities/helpers/SuperActivity.java | 18 +- .../activities/helpers/SuperUI.java | 2 +- .../activities/interfaces/HelpProvider.java | 15 + .../fragments/SettingsFragment.java | 42 ++- .../fragments/helpers/HelpDialogFragment.java | 54 +++ .../src/org/droidplanner/utils/Constants.java | 5 + .../adapterViews/NavigationDrawerAdapter.java | 336 +++++++++++++++--- 16 files changed, 530 insertions(+), 151 deletions(-) create mode 100644 DroidPlanner/res/layout/preference_config_screen.xml delete mode 100644 DroidPlanner/src/org/droidplanner/activities/helpers/HelpActivity.java create mode 100644 DroidPlanner/src/org/droidplanner/activities/interfaces/HelpProvider.java create mode 100644 DroidPlanner/src/org/droidplanner/fragments/helpers/HelpDialogFragment.java diff --git a/DroidPlanner/AndroidManifest.xml b/DroidPlanner/AndroidManifest.xml index 629132a46c..450bf8b500 100644 --- a/DroidPlanner/AndroidManifest.xml +++ b/DroidPlanner/AndroidManifest.xml @@ -96,6 +96,7 @@ @@ -115,6 +116,7 @@ @@ -125,6 +127,7 @@ android:value=".activities.SettingsActivity" /> diff --git a/DroidPlanner/res/layout/preference_config_screen.xml b/DroidPlanner/res/layout/preference_config_screen.xml new file mode 100644 index 0000000000..dee7c07e73 --- /dev/null +++ b/DroidPlanner/res/layout/preference_config_screen.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DroidPlanner/res/menu/menu_super_activiy.xml b/DroidPlanner/res/menu/menu_super_activiy.xml index 2e4fea7d4d..f3e6c62dc4 100644 --- a/DroidPlanner/res/menu/menu_super_activiy.xml +++ b/DroidPlanner/res/menu/menu_super_activiy.xml @@ -27,16 +27,4 @@ android:showAsAction="never" android:title="@string/menu_disconnect"/> - - - diff --git a/DroidPlanner/res/values/strings.xml b/DroidPlanner/res/values/strings.xml index 6c92805f1f..75366e1261 100644 --- a/DroidPlanner/res/values/strings.xml +++ b/DroidPlanner/res/values/strings.xml @@ -8,6 +8,7 @@ Settings Help Drone Setup + App Settings Flight Data Editor Send Mission @@ -351,7 +352,5 @@ Please connect first Mode 1: Throttle on RIGHT stick Mode 2: Throttle on LEFT stick - App Settings - Drone Settings diff --git a/DroidPlanner/res/xml/preferences.xml b/DroidPlanner/res/xml/preferences.xml index e9ec385d13..951f8936f0 100644 --- a/DroidPlanner/res/xml/preferences.xml +++ b/DroidPlanner/res/xml/preferences.xml @@ -1,7 +1,9 @@ - + + , Integer> sActivityGroupIndexMap = + new HashMap, Integer>(); + + static { + sActivityGroupIndexMap.put(FlightActivity.class, 0); + sActivityGroupIndexMap.put(SettingsActivity.class, 1); + } + + private final static boolean[] sIsGroupExpanded = {false, false, false}; + + /** + * Delay used to run the callback on selection in the drawer layout. This delay allows the + * drawer layout to close smoothly without stuttering/janking. + */ + private final static long CALLBACK_LAUNCH_DELAY = 200l;// milliseconds + + /** + * Handler used to launch the selected callback. + */ + private final Handler mHandler = new Handler(); + /** + * Container activity + */ + private final DrawerNavigationUI mActivity; - //TODO: complete - private static final int[] mGroupTo = {R.id.nav_drawer_group}; - private static final int[] mChildTo = {R.id.nav_drawer_child}; + /** + * Activity's drawer layout. Used to close the drawer on item click. + */ + private final DrawerLayout mDrawerLayout; /** * Each entry in the list corresponds to one section in the app. */ - private static final List> mGroupData = new ArrayList>(); + private final List> mGroupData; - static { - //Flight section - final Map flightData = new HashMap(); - flightData.put(KEY_SECTION_NAME, R.string.flight_data); - flightData.put(KEY_SECTION_ICON, R.drawable.ic_action_plane); - mGroupData.add(flightData); + /** + * Stores the app subsections' data. + */ + private final List>> mChildData; - //Settings section - final Map droneSetupData = new HashMap(); - droneSetupData.put(KEY_SECTION_NAME, R.string.settings); - droneSetupData.put(KEY_SECTION_ICON, R.drawable.ic_action_settings); - mGroupData.add(droneSetupData); + /** + * Expandable list view this adapter is attached to. + * We keep a reference in order to expand/collapse the group(s) when the expand/collapse icon + * is clicked. + */ + private final ExpandableListView mNavHubView; - //Help section - final Map helpData = new HashMap(); - helpData.put(KEY_SECTION_NAME, R.string.help); - helpData.put(KEY_SECTION_ICON, R.drawable.ic_action_help); - mGroupData.add(helpData); + /** + * Uses to inflate the expandable list items' views. + */ + private final LayoutInflater mInflater; + + public NavigationDrawerAdapter(DrawerNavigationUI activity) { + if (!sActivityGroupIndexMap.containsKey(activity.getClass())) { + throw new IllegalArgumentException("Invalid container activity."); + } + + mActivity = activity; + mDrawerLayout = activity.getDrawerLayout(); + mNavHubView = activity.getNavHubView(); + mNavHubView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + @Override + public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, + long id) { + performCallback((Map) getGroup(groupPosition)); + return true; + } + }); + mNavHubView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { + @Override + public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, + int childPosition, long id) { + performCallback((Map) getChild(groupPosition, childPosition)); + return true; + } + }); + + mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + mChildData = new ArrayList>>(); + initChildData(activity); + + mGroupData = new ArrayList>(); + initGroupData(activity); + + if (sIsGroupExpanded.length != getGroupCount()) { + throw new IllegalStateException("Group state cache doesn't match with group data."); + } } /** - * Stores the app subsections' data. + * Updates the hub view this adapter is attached to. */ - private static final List>> mChildData = new - ArrayList>>(); + public void refreshHubView(){ + //Expand or collapse the group + final int groupCount = sIsGroupExpanded.length; + for (int i = 0; i < groupCount; i++) { + if (sIsGroupExpanded[i]) + mNavHubView.expandGroup(i); + else + mNavHubView.collapseGroup(i); + } - static { + //Select the container activity's group + final int groupPosition = sActivityGroupIndexMap.get(mActivity.getClass()); + final int flatPosition = mNavHubView.getFlatListPosition(ExpandableListView + .getPackedPositionForGroup(groupPosition)); + mNavHubView.setItemChecked(flatPosition, true); + } + + private void performCallback(Map itemData){ + mDrawerLayout.closeDrawer(mNavHubView); + + /* + Run the callback after the drawer is almost closed. + Another solution would be to listen to DrawerListener.onDrawerClosed calls, + but that has a high amount of latency. + */ + final Runnable clickCb = (Runnable) itemData.get(KEY_SECTION_CALLBACK); + mHandler.postDelayed(clickCb, CALLBACK_LAUNCH_DELAY); + } + + /** + * Binds the navigation drawer adapter to the expandable list view passed in the constructor. + */ + public void attachExpandableListView() { + mNavHubView.setAdapter(this); + refreshHubView(); + } + + private void initChildData(final DrawerNavigationUI activity) { /* Flight section */ //Editor activity - Map editorData = new HashMap(); + Map editorData = new HashMap(); editorData.put(KEY_SECTION_NAME, R.string.editor); editorData.put(KEY_SECTION_ICON, R.drawable.ic_action_location); + editorData.put(KEY_SECTION_CALLBACK, new Runnable() { + @Override + public void run() { + activity.startActivity(new Intent(activity, EditorActivity.class)); + } + }); - final List> flightGroup = new ArrayList>(); + final List> flightGroup = new ArrayList>(); flightGroup.add(editorData); mChildData.add(flightGroup); @@ -83,16 +197,25 @@ public class NavigationDrawerAdapter extends SimpleExpandableListAdapter { Settings section */ //Retrieve the elements in the settings section from the ConfigurationActivity - final List> setupGroup = new ArrayList>(); + final List> setupGroup = new ArrayList>(); final int configurationFragmentsCount = ConfigurationActivity.sConfigurationFragments .length; for (int i = 0; i < configurationFragmentsCount; i++) { - final Map configData = new HashMap(); + final int index = i; + final Map configData = new HashMap(); configData.put(KEY_SECTION_NAME, ConfigurationActivity .sConfigurationFragmentTitlesRes[i]); configData.put(KEY_SECTION_ICON, ConfigurationActivity .sConfigurationFragmentIconRes[i]); + configData.put(KEY_SECTION_CALLBACK, new Runnable() { + @Override + public void run() { + activity.startActivity(new Intent(activity, ConfigurationActivity.class) + .putExtra(ConfigurationActivity.EXTRA_CONFIG_SCREEN_INDEX, index)); + } + }); setupGroup.add(configData); } @@ -103,12 +226,46 @@ public class NavigationDrawerAdapter extends SimpleExpandableListAdapter { Help section */ //No children for the help section - mChildData.add(Collections.>emptyList()); + mChildData.add(Collections.>emptyList()); } - public NavigationDrawerAdapter(Context context) { - super(context, mGroupData, R.layout.adapter_nav_drawer_group, mGroupFrom, mGroupTo, - mChildData, R.layout.adapter_nav_drawer_child, mChildFrom, mChildTo); + private void initGroupData(final DrawerNavigationUI activity) { + //Flight section + final Map flightData = new HashMap(); + flightData.put(KEY_SECTION_NAME, R.string.flight_data); + flightData.put(KEY_SECTION_ICON, R.drawable.ic_action_plane); + flightData.put(KEY_SECTION_CALLBACK, new Runnable() { + @Override + public void run() { + activity.startActivity(new Intent(activity, FlightActivity.class)); + } + }); + mGroupData.add(flightData); + + //Settings section + final Map droneSetupData = new HashMap(); + droneSetupData.put(KEY_SECTION_NAME, R.string.settings); + droneSetupData.put(KEY_SECTION_ICON, R.drawable.ic_action_settings); + droneSetupData.put(KEY_SECTION_CALLBACK, new Runnable() { + @Override + public void run() { + activity.startActivity(new Intent(activity, SettingsActivity.class)); + } + }); + mGroupData.add(droneSetupData); + + //Help section + final Map helpData = new HashMap(); + helpData.put(KEY_SECTION_NAME, R.string.help); + helpData.put(KEY_SECTION_ICON, R.drawable.ic_action_help); + helpData.put(KEY_SECTION_CALLBACK, new Runnable() { + @Override + public void run() { + final HelpDialogFragment helpDialog = HelpDialogFragment.newInstance(); + helpDialog.show(activity.getSupportFragmentManager(), "Help Dialog"); + } + }); + mGroupData.add(helpData); } @Override @@ -116,20 +273,70 @@ public View getChildView(int groupPosition, int childPosition, boolean isLastChi View convertView, ViewGroup parent) { View v; if (convertView == null) { - v = newChildView(isLastChild, parent); + v = newChildView(parent); } else { v = convertView; } - bindView(v, mChildData.get(groupPosition).get(childPosition), mChildFrom, mChildTo); + bindView(v, mChildData.get(groupPosition).get(childPosition), R.id.nav_drawer_child); return v; } + /** + * Instantiates a new View for a child. + * + * @param parent The eventual parent of this new View. + * @return A new child View + */ + public View newChildView(ViewGroup parent) { + return mInflater.inflate(R.layout.adapter_nav_drawer_child, parent, false); + } + + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + + @Override + public int getGroupCount() { + return mGroupData.size(); + } + + @Override + public int getChildrenCount(int groupPosition) { + return mChildData.get(groupPosition).size(); + } + @Override - public View getGroupView(int groupPosition, boolean isExpanded, View convertView, + public Object getGroup(int groupPosition) { + return mGroupData.get(groupPosition); + } + + @Override + public Object getChild(int groupPosition, int childPosition) { + return mChildData.get(groupPosition).get(childPosition); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public boolean hasStableIds() { + return true; + } + + @Override + public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { View v; if (convertView == null) { - v = newGroupView(isExpanded, parent); + v = newGroupView(parent); } else { v = convertView; } @@ -139,24 +346,47 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView expandIcon.setVisibility(View.GONE); } else { expandIcon.setVisibility(View.VISIBLE); - expandIcon.setImageResource(isExpanded - ? R.drawable.expandable_listview_icon_expanded - : R.drawable.expandable_listview_icon_collapsed); + if (isExpanded) { + expandIcon.setImageResource(R.drawable.expandable_listview_icon_expanded); + expandIcon.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNavHubView.collapseGroup(groupPosition); + sIsGroupExpanded[groupPosition] = false; + } + }); + } else { + expandIcon.setImageResource(R.drawable.expandable_listview_icon_collapsed); + expandIcon.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mNavHubView.expandGroup(groupPosition); + sIsGroupExpanded[groupPosition] = true; + } + }); + } } - bindView(v, mGroupData.get(groupPosition), mGroupFrom, mGroupTo); + bindView(v, mGroupData.get(groupPosition), R.id.nav_drawer_group); return v; } - private void bindView(View view, Map data, String[] from, int[] to) { - int len = to.length; + /** + * Instantiates a new View for a group. + * + * @param parent The eventual parent of this new View. + * @return A new group View + */ + public View newGroupView(ViewGroup parent) { + return mInflater.inflate(R.layout.adapter_nav_drawer_group, parent, false); + } - for (int i = 0; i < len; i += 2) { - TextView v = (TextView) view.findViewById(to[i]); - if (v != null) { - v.setText(data.get(from[i])); - v.setCompoundDrawablesWithIntrinsicBounds(data.get(from[i + 1]), 0, 0, 0); - } + private void bindView(View view, Map data, int textViewId) { + final TextView textView = (TextView) view.findViewById(textViewId); + if (textView != null) { + textView.setText((Integer) data.get(KEY_SECTION_NAME)); + textView.setCompoundDrawablesWithIntrinsicBounds((Integer) data.get(KEY_SECTION_ICON), + 0, 0, 0); } } } From ca8aec9de92e46a4a83c74fc870d17dbf65b51bf Mon Sep 17 00:00:00 2001 From: Arthur Benemann Date: Tue, 25 Feb 2014 19:42:59 -0300 Subject: [PATCH 6/7] OrganizeImports: Automatic organize imports done by Eclipse --- .../activities/ConfigurationActivity.java | 21 ++++++------ .../activities/DrawerNavigationUI.java | 15 +++------ .../activities/EditorActivity.java | 4 +-- .../activities/FlightActivity.java | 14 -------- .../activities/SettingsActivity.java | 6 ++-- .../activities/helpers/SuperActivity.java | 7 ++-- .../activities/helpers/SuperUI.java | 8 ++--- .../droidplanner/adapters/ParamsAdapter.java | 32 ++++++++----------- .../checklist/CheckListAdapter.java | 4 +-- .../checklist/CheckListXmlParser.java | 1 - .../checklist/listadapter/ListXmlAdapter.java | 3 +- .../checklist/row/BaseViewHolder.java | 3 +- .../checklist/row/ListRow_CheckBox.java | 2 +- .../checklist/row/ListRow_Level.java | 2 +- .../checklist/row/ListRow_Note.java | 3 +- .../checklist/row/ListRow_Radio.java | 2 +- .../checklist/row/ListRow_Select.java | 2 +- .../checklist/row/ListRow_Switch.java | 2 +- .../checklist/row/ListRow_Toggle.java | 4 +-- .../checklist/row/ListRow_Value.java | 2 +- .../checklist/xml/ListXmlParser.java | 1 + .../connection/BluetoothConnection.java | 17 +++++----- .../connection/UsbConnection.java | 14 ++++---- .../droidplanner/dialogs/AltitudeDialog.java | 2 +- .../dialogs/openfile/OpenFileDialog.java | 4 +-- .../parameters/DialogParameterInfo.java | 22 +++++++------ .../droidplanner/drone/variables/Battery.java | 2 +- .../drone/variables/Calibration.java | 2 +- .../org/droidplanner/drone/variables/GPS.java | 3 +- .../drone/variables/HeartBeat.java | 4 +-- .../droidplanner/drone/variables/Home.java | 2 +- .../drone/variables/Navigation.java | 2 +- .../drone/variables/Orientation.java | 2 +- .../drone/variables/Parameters.java | 2 +- .../droidplanner/drone/variables/Profile.java | 1 + .../org/droidplanner/drone/variables/RC.java | 2 +- .../droidplanner/drone/variables/Radio.java | 2 +- .../droidplanner/drone/variables/State.java | 2 +- .../droidplanner/drone/variables/Type.java | 2 +- .../variables/mission/WaypointMananger.java | 2 +- .../survey/grid/CircumscribedGrid.java | 2 +- .../mission/survey/grid/GridBuilder.java | 4 +-- .../variables/mission/waypoints/Loiter.java | 2 +- .../mission/waypoints/RegionOfInterest.java | 2 +- .../variables/mission/waypoints/Waypoint.java | 2 +- .../src/org/droidplanner/file/AssetUtil.java | 4 +-- .../droidplanner/file/IO/MissionReader.java | 2 -- .../file/IO/ParameterMetadataMapReader.java | 11 ++++--- .../droidplanner/file/IO/VehicleProfile.java | 6 ++-- .../file/IO/VehicleProfileReader.java | 20 ++++++------ .../fragments/ChecklistFragment.java | 8 ++--- .../fragments/EditorListFragment.java | 5 ++- .../fragments/EditorToolsFragment.java | 7 ++-- .../fragments/FlightActionsFragment.java | 2 +- .../fragments/ParamsFragment.java | 3 +- .../droidplanner/fragments/RCFragment.java | 3 +- .../fragments/SettingsFragment.java | 5 ++- .../fragments/SetupRadioFragment.java | 1 - .../fragments/TelemetryFragment.java | 3 +- .../fragments/TuningFragment.java | 3 +- .../calibration/FragmentSetupNext.java | 6 ++-- .../calibration/FragmentSetupProgress.java | 2 +- .../calibration/FragmentSetupSend.java | 6 ++-- .../calibration/FragmentSetupStart.java | 6 ++-- .../calibration/FragmentSetupSummary.java | 3 +- .../fragments/calibration/SetupMainPanel.java | 1 + .../flightmodes/FragmentSetupFM.java | 4 +-- .../calibration/imu/FragmentSetupIMU.java | 2 +- .../imu/FragmentSetupIMUCalibrate.java | 2 +- .../calibration/mag/FragmentSetupMAG.java | 2 +- .../calibration/rc/FragmentSetupRC.java | 3 +- .../helpers/BTDeviceListFragment.java | 11 ++++--- .../helpers/FlightSlidingDrawerContent.java | 8 ++--- .../fragments/helpers/GestureMapFragment.java | 3 +- .../fragments/helpers/GuidePointListener.java | 3 -- .../fragments/helpers/HelpDialogFragment.java | 6 ++-- .../fragments/helpers/OfflineMapFragment.java | 9 +++--- .../fragments/helpers/SuperSetupFragment.java | 5 ++- .../helpers/SuperSetupMainPanel.java | 1 - .../fragments/markers/GcpMarker.java | 2 +- .../fragments/markers/GuidedMarker.java | 2 +- .../fragments/markers/HomeMarker.java | 2 +- .../markers/helpers/MarkerWithText.java | 13 +++++--- .../mission/MissionDetailFragment.java | 5 ++- .../mission/MissionLandFragment.java | 3 +- .../mission/MissionLoiterFragment.java | 3 +- .../mission/MissionLoiterNFragment.java | 3 +- .../mission/MissionLoiterTFragment.java | 3 +- .../fragments/mission/MissionRTLFragment.java | 3 +- .../MissionRegionOfInterestFragment.java | 3 +- .../mission/MissionTakeoffFragment.java | 3 +- .../mission/MissionWaypointFragment.java | 3 +- .../fragments/mode/FlightModePanel.java | 13 ++++---- .../fragments/mode/ModeAcroFragment.java | 6 ++-- .../fragments/mode/ModeAltholdFragment.java | 6 ++-- .../fragments/mode/ModeAutoFragment.java | 4 +-- .../fragments/mode/ModeCircleFragment.java | 6 ++-- .../mode/ModeDisconnectedFragment.java | 6 ++-- .../fragments/mode/ModeDriftFragment.java | 6 ++-- .../fragments/mode/ModeGuidedFragment.java | 5 ++- .../fragments/mode/ModeLandFragment.java | 6 ++-- .../fragments/mode/ModeLoiterFragment.java | 6 ++-- .../fragments/mode/ModeOFLoiterFragment.java | 4 +-- .../fragments/mode/ModePositionFragment.java | 6 ++-- .../fragments/mode/ModeRTLFragment.java | 4 +-- .../fragments/mode/ModeSportFragment.java | 4 +-- .../fragments/mode/ModeStabilizeFragment.java | 6 ++-- .../helpers/LocalMapTileProvider.java | 2 -- .../org/droidplanner/helpers/RecordMe.java | 1 - .../parameters/ParameterMetadata.java | 1 - .../src/org/droidplanner/polygon/Polygon.java | 3 +- .../droidplanner/polygon/PolygonPoint.java | 2 +- .../droidplanner/service/MAVLinkService.java | 11 +++---- .../src/org/droidplanner/utils/Constants.java | 2 +- .../src/org/droidplanner/utils/Utils.java | 11 +++---- .../NumberFieldEdit/NumberFieldEdit.java | 4 +-- .../SeekBarWithText/SeekBarWithText.java | 4 +-- .../InfoBarActionProvider.java | 10 +++--- .../widgets/actionProviders/InfoBarItem.java | 14 ++++---- .../widgets/adapterViews/MissionItemView.java | 3 +- .../adapterViews/NavigationDrawerAdapter.java | 28 ++++++++-------- .../widgets/button/RadioButtonCenter.java | 3 +- .../widgets/spinners/ModeAdapter.java | 5 +-- .../widgets/viewPager/TabPageIndicator.java | 9 +++--- .../com/MAVLink/Messages/MAVLinkPacket.java | 4 ++- .../Messages/ardupilotmega/msg_ahrs.java | 2 +- .../Messages/ardupilotmega/msg_ap_adc.java | 2 +- .../Messages/ardupilotmega/msg_attitude.java | 2 +- .../msg_attitude_quaternion.java | 2 +- .../Messages/ardupilotmega/msg_auth_key.java | 2 +- .../ardupilotmega/msg_battery_status.java | 2 +- .../msg_change_operator_control.java | 2 +- .../msg_change_operator_control_ack.java | 2 +- .../ardupilotmega/msg_command_ack.java | 2 +- .../ardupilotmega/msg_command_long.java | 2 +- .../Messages/ardupilotmega/msg_data16.java | 2 +- .../Messages/ardupilotmega/msg_data32.java | 2 +- .../Messages/ardupilotmega/msg_data64.java | 2 +- .../Messages/ardupilotmega/msg_data96.java | 2 +- .../ardupilotmega/msg_data_stream.java | 2 +- .../Messages/ardupilotmega/msg_debug.java | 2 +- .../ardupilotmega/msg_debug_vect.java | 2 +- .../ardupilotmega/msg_digicam_configure.java | 2 +- .../ardupilotmega/msg_digicam_control.java | 2 +- .../ardupilotmega/msg_fence_fetch_point.java | 2 +- .../ardupilotmega/msg_fence_point.java | 2 +- .../ardupilotmega/msg_fence_status.java | 2 +- .../msg_file_transfer_dir_list.java | 2 +- .../ardupilotmega/msg_file_transfer_res.java | 2 +- .../msg_file_transfer_start.java | 2 +- .../msg_global_position_int.java | 2 +- .../msg_global_position_setpoint_int.java | 2 +- .../msg_global_vision_position_estimate.java | 2 +- .../ardupilotmega/msg_gps_global_origin.java | 2 +- .../ardupilotmega/msg_gps_raw_int.java | 2 +- .../ardupilotmega/msg_gps_status.java | 2 +- .../Messages/ardupilotmega/msg_heartbeat.java | 2 +- .../ardupilotmega/msg_highres_imu.java | 2 +- .../ardupilotmega/msg_hil_controls.java | 2 +- .../ardupilotmega/msg_hil_rc_inputs_raw.java | 2 +- .../Messages/ardupilotmega/msg_hil_state.java | 2 +- .../Messages/ardupilotmega/msg_hwstatus.java | 2 +- .../ardupilotmega/msg_limits_status.java | 2 +- .../ardupilotmega/msg_local_position_ned.java | 2 +- ...cal_position_ned_system_global_offset.java | 2 +- .../msg_local_position_setpoint.java | 2 +- .../ardupilotmega/msg_manual_control.java | 2 +- .../ardupilotmega/msg_manual_setpoint.java | 2 +- .../Messages/ardupilotmega/msg_meminfo.java | 2 +- .../ardupilotmega/msg_memory_vect.java | 2 +- .../ardupilotmega/msg_mission_ack.java | 2 +- .../ardupilotmega/msg_mission_clear_all.java | 2 +- .../ardupilotmega/msg_mission_count.java | 2 +- .../ardupilotmega/msg_mission_current.java | 2 +- .../ardupilotmega/msg_mission_item.java | 2 +- .../msg_mission_item_reached.java | 2 +- .../ardupilotmega/msg_mission_request.java | 2 +- .../msg_mission_request_list.java | 2 +- .../msg_mission_request_partial_list.java | 2 +- .../msg_mission_set_current.java | 2 +- .../msg_mission_write_partial_list.java | 2 +- .../ardupilotmega/msg_mount_configure.java | 2 +- .../ardupilotmega/msg_mount_control.java | 2 +- .../ardupilotmega/msg_mount_status.java | 2 +- .../ardupilotmega/msg_named_value_float.java | 2 +- .../ardupilotmega/msg_named_value_int.java | 2 +- .../msg_nav_controller_output.java | 2 +- .../ardupilotmega/msg_optical_flow.java | 2 +- .../ardupilotmega/msg_param_request_list.java | 2 +- .../ardupilotmega/msg_param_request_read.java | 2 +- .../Messages/ardupilotmega/msg_param_set.java | 2 +- .../ardupilotmega/msg_param_value.java | 2 +- .../Messages/ardupilotmega/msg_ping.java | 2 +- .../Messages/ardupilotmega/msg_radio.java | 2 +- .../Messages/ardupilotmega/msg_raw_imu.java | 2 +- .../ardupilotmega/msg_raw_pressure.java | 2 +- .../msg_rc_channels_override.java | 2 +- .../ardupilotmega/msg_rc_channels_raw.java | 2 +- .../ardupilotmega/msg_rc_channels_scaled.java | 2 +- .../msg_request_data_stream.java | 2 +- ..._roll_pitch_yaw_rates_thrust_setpoint.java | 2 +- ..._roll_pitch_yaw_speed_thrust_setpoint.java | 2 +- .../msg_roll_pitch_yaw_thrust_setpoint.java | 2 +- .../msg_safety_allowed_area.java | 2 +- .../msg_safety_set_allowed_area.java | 2 +- .../ardupilotmega/msg_scaled_imu.java | 2 +- .../ardupilotmega/msg_scaled_pressure.java | 2 +- .../ardupilotmega/msg_sensor_offsets.java | 2 +- .../ardupilotmega/msg_servo_output_raw.java | 2 +- .../msg_set_global_position_setpoint_int.java | 2 +- .../msg_set_gps_global_origin.java | 2 +- .../msg_set_local_position_setpoint.java | 2 +- .../ardupilotmega/msg_set_mag_offsets.java | 2 +- .../Messages/ardupilotmega/msg_set_mode.java | 2 +- .../msg_set_quad_motors_setpoint.java | 2 +- ..._quad_swarm_led_roll_pitch_yaw_thrust.java | 2 +- ..._set_quad_swarm_roll_pitch_yaw_thrust.java | 2 +- .../msg_set_roll_pitch_yaw_speed_thrust.java | 2 +- .../msg_set_roll_pitch_yaw_thrust.java | 2 +- .../ardupilotmega/msg_setpoint_6dof.java | 2 +- .../ardupilotmega/msg_setpoint_8dof.java | 2 +- .../Messages/ardupilotmega/msg_simstate.java | 2 +- .../ardupilotmega/msg_state_correction.java | 2 +- .../ardupilotmega/msg_statustext.java | 2 +- .../ardupilotmega/msg_sys_status.java | 2 +- .../ardupilotmega/msg_system_time.java | 2 +- .../Messages/ardupilotmega/msg_vfr_hud.java | 2 +- .../msg_vicon_position_estimate.java | 2 +- .../msg_vision_position_estimate.java | 2 +- .../msg_vision_speed_estimate.java | 2 +- .../Messages/ardupilotmega/msg_wind.java | 2 +- 231 files changed, 406 insertions(+), 464 deletions(-) diff --git a/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java b/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java index a8435d1bff..8c9edb3eba 100644 --- a/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/ConfigurationActivity.java @@ -1,5 +1,16 @@ package org.droidplanner.activities; +import org.droidplanner.R; +import org.droidplanner.activities.helpers.SuperUI; +import org.droidplanner.drone.Drone; +import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.fragments.ChecklistFragment; +import org.droidplanner.fragments.ParamsFragment; +import org.droidplanner.fragments.SetupRadioFragment; +import org.droidplanner.fragments.SetupSensorFragment; +import org.droidplanner.fragments.TuningFragment; +import org.droidplanner.widgets.viewPager.TabPageIndicator; + import android.app.ActionBar; import android.content.Context; import android.content.Intent; @@ -12,16 +23,6 @@ import android.util.Log; import android.view.MenuItem; import android.widget.ArrayAdapter; -import org.droidplanner.R; -import org.droidplanner.activities.helpers.SuperUI; -import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneInterfaces.DroneEventsType; -import org.droidplanner.fragments.ChecklistFragment; -import org.droidplanner.fragments.ParamsFragment; -import org.droidplanner.fragments.SetupRadioFragment; -import org.droidplanner.fragments.SetupSensorFragment; -import org.droidplanner.fragments.TuningFragment; -import org.droidplanner.widgets.viewPager.TabPageIndicator; /** * This class implements and handles the various ui used for the drone configuration. diff --git a/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java b/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java index dd29754eca..76a485eadb 100644 --- a/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java +++ b/DroidPlanner/src/org/droidplanner/activities/DrawerNavigationUI.java @@ -1,24 +1,19 @@ package org.droidplanner.activities; +import org.droidplanner.R; +import org.droidplanner.activities.helpers.SuperUI; +import org.droidplanner.activities.interfaces.HelpProvider; +import org.droidplanner.widgets.adapterViews.NavigationDrawerAdapter; + import android.app.ActionBar; -import android.content.Intent; -import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.widget.DrawerLayout; -import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ExpandableListView; -import org.droidplanner.R; -import org.droidplanner.activities.helpers.SuperUI; -import org.droidplanner.activities.interfaces.HelpProvider; -import org.droidplanner.utils.Utils; -import org.droidplanner.widgets.adapterViews.NavigationDrawerAdapter; - /** * This abstract activity provides its children access to a navigation drawer interface. */ diff --git a/DroidPlanner/src/org/droidplanner/activities/EditorActivity.java b/DroidPlanner/src/org/droidplanner/activities/EditorActivity.java index c6400cd9e1..2e59b61521 100644 --- a/DroidPlanner/src/org/droidplanner/activities/EditorActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/EditorActivity.java @@ -2,6 +2,7 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.activities.helpers.OnEditorInteraction; import org.droidplanner.activities.helpers.SuperUI; import org.droidplanner.drone.Drone; @@ -14,8 +15,8 @@ import org.droidplanner.fragments.EditorToolsFragment.EditorTools; import org.droidplanner.fragments.EditorToolsFragment.OnEditorToolSelected; import org.droidplanner.fragments.helpers.GestureMapFragment; -import org.droidplanner.fragments.helpers.MapProjection; import org.droidplanner.fragments.helpers.GestureMapFragment.OnPathFinishedListener; +import org.droidplanner.fragments.helpers.MapProjection; import org.droidplanner.fragments.mission.MissionDetailFragment; import org.droidplanner.fragments.mission.MissionDetailFragment.OnWayPointTypeChangeListener; @@ -32,7 +33,6 @@ import android.widget.ListView; import android.widget.TextView; -import org.droidplanner.R; import com.google.android.gms.maps.model.LatLng; public class EditorActivity extends SuperUI implements OnPathFinishedListener, diff --git a/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java b/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java index 88e81c431d..1d7051a3ee 100644 --- a/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/FlightActivity.java @@ -1,7 +1,6 @@ package org.droidplanner.activities; import org.droidplanner.R; -import org.droidplanner.activities.helpers.SuperUI; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; @@ -11,22 +10,9 @@ import org.droidplanner.fragments.FlightMapFragment; import org.droidplanner.fragments.RCFragment; import org.droidplanner.fragments.TelemetryFragment; -import org.droidplanner.fragments.helpers.DroneMap; import org.droidplanner.fragments.helpers.FlightSlidingDrawerContent; import org.droidplanner.fragments.helpers.OnMapInteractionListener; import org.droidplanner.fragments.mode.FlightModePanel; -import org.droidplanner.fragments.mode.ModeAcroFragment; -import org.droidplanner.fragments.mode.ModeAltholdFragment; -import org.droidplanner.fragments.mode.ModeAutoFragment; -import org.droidplanner.fragments.mode.ModeCircleFragment; -import org.droidplanner.fragments.mode.ModeDisconnectedFragment; -import org.droidplanner.fragments.mode.ModeDriftFragment; -import org.droidplanner.fragments.mode.ModeGuidedFragment; -import org.droidplanner.fragments.mode.ModeLandFragment; -import org.droidplanner.fragments.mode.ModeLoiterFragment; -import org.droidplanner.fragments.mode.ModePositionFragment; -import org.droidplanner.fragments.mode.ModeRTLFragment; -import org.droidplanner.fragments.mode.ModeStabilizeFragment; import org.droidplanner.polygon.PolygonPoint; import android.app.Dialog; diff --git a/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java b/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java index a558dc163f..bdb0ef0d5f 100644 --- a/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/SettingsActivity.java @@ -1,12 +1,12 @@ package org.droidplanner.activities; +import org.droidplanner.R; +import org.droidplanner.fragments.SettingsFragment; + import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import org.droidplanner.R; -import org.droidplanner.fragments.SettingsFragment; - /** * This activity holds the SettingsFragment. */ diff --git a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperActivity.java b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperActivity.java index 06d585c18b..cbd8587dfa 100644 --- a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperActivity.java +++ b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperActivity.java @@ -2,23 +2,20 @@ import org.droidplanner.DroidPlannerApp; import org.droidplanner.R; -import org.droidplanner.activities.ConfigurationActivity; -import org.droidplanner.activities.SettingsActivity; import org.droidplanner.dialogs.AltitudeDialog; import org.droidplanner.dialogs.AltitudeDialog.OnAltitudeChangedListener; import org.droidplanner.drone.Drone; import org.droidplanner.fragments.helpers.BTDeviceListFragment; import org.droidplanner.fragments.helpers.OfflineMapFragment; import org.droidplanner.helpers.units.Altitude; +import org.droidplanner.utils.Constants; +import org.droidplanner.utils.Utils; -import android.content.Intent; import android.media.AudioManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.FragmentActivity; import android.view.MenuItem; -import org.droidplanner.utils.Constants; -import org.droidplanner.utils.Utils; public abstract class SuperActivity extends FragmentActivity implements OnAltitudeChangedListener { diff --git a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java index 36b779bd9d..1d7c5d27dd 100644 --- a/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java +++ b/DroidPlanner/src/org/droidplanner/activities/helpers/SuperUI.java @@ -1,10 +1,6 @@ package org.droidplanner.activities.helpers; -import android.os.Bundle; -import android.view.Menu; -import android.view.MenuItem; import org.droidplanner.R; -import org.droidplanner.activities.interfaces.HelpProvider; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; @@ -12,6 +8,10 @@ import org.droidplanner.utils.Utils; import org.droidplanner.widgets.actionProviders.InfoBarActionProvider; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + public abstract class SuperUI extends SuperActivity implements OnDroneListener { private ScreenOrientation screenOrientation = new ScreenOrientation(this); private InfoBarActionProvider infoBar; diff --git a/DroidPlanner/src/org/droidplanner/adapters/ParamsAdapter.java b/DroidPlanner/src/org/droidplanner/adapters/ParamsAdapter.java index 85d963829d..c379af9adb 100644 --- a/DroidPlanner/src/org/droidplanner/adapters/ParamsAdapter.java +++ b/DroidPlanner/src/org/droidplanner/adapters/ParamsAdapter.java @@ -1,5 +1,18 @@ package org.droidplanner.adapters; +import java.text.DecimalFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.droidplanner.R; +import org.droidplanner.drone.Drone; +import org.droidplanner.file.IO.ParameterMetadataMapReader; +import org.droidplanner.file.IO.VehicleProfile; +import org.droidplanner.parameters.Parameter; +import org.droidplanner.parameters.ParameterMetadata; + import android.app.Activity; import android.content.Context; import android.graphics.Color; @@ -12,25 +25,6 @@ import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.TextView; -import org.droidplanner.R; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.droidplanner.DroidPlannerApp; -import org.droidplanner.drone.Drone; -import org.droidplanner.file.DirectoryPath; -import org.droidplanner.file.IO.ParameterMetadataMapReader; -import org.droidplanner.file.IO.VehicleProfile; -import org.droidplanner.parameters.Parameter; -import org.droidplanner.parameters.ParameterMetadata; /** * Date: 2013-12-08 diff --git a/DroidPlanner/src/org/droidplanner/checklist/CheckListAdapter.java b/DroidPlanner/src/org/droidplanner/checklist/CheckListAdapter.java index e162cbaa3d..857cc1d46b 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/CheckListAdapter.java +++ b/DroidPlanner/src/org/droidplanner/checklist/CheckListAdapter.java @@ -4,10 +4,12 @@ import java.util.HashMap; import java.util.List; +import org.droidplanner.R; import org.droidplanner.checklist.listadapter.ListXmlAdapter; import org.droidplanner.checklist.row.ListRow; import org.droidplanner.checklist.row.ListRow_CheckBox; import org.droidplanner.checklist.row.ListRow_Interface; +import org.droidplanner.checklist.row.ListRow_Interface.OnRowItemChangeListener; import org.droidplanner.checklist.row.ListRow_Level; import org.droidplanner.checklist.row.ListRow_Note; import org.droidplanner.checklist.row.ListRow_Radio; @@ -16,9 +18,7 @@ import org.droidplanner.checklist.row.ListRow_Toggle; import org.droidplanner.checklist.row.ListRow_Type; import org.droidplanner.checklist.row.ListRow_Value; -import org.droidplanner.checklist.row.ListRow_Interface.OnRowItemChangeListener; -import org.droidplanner.R; import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; diff --git a/DroidPlanner/src/org/droidplanner/checklist/CheckListXmlParser.java b/DroidPlanner/src/org/droidplanner/checklist/CheckListXmlParser.java index 99d93301ee..449de6d55b 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/CheckListXmlParser.java +++ b/DroidPlanner/src/org/droidplanner/checklist/CheckListXmlParser.java @@ -8,7 +8,6 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; - import android.content.Context; public class CheckListXmlParser extends ListXmlParser { diff --git a/DroidPlanner/src/org/droidplanner/checklist/listadapter/ListXmlAdapter.java b/DroidPlanner/src/org/droidplanner/checklist/listadapter/ListXmlAdapter.java index 19fff10d85..7b27f3100c 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/listadapter/ListXmlAdapter.java +++ b/DroidPlanner/src/org/droidplanner/checklist/listadapter/ListXmlAdapter.java @@ -3,9 +3,8 @@ import java.util.HashMap; import java.util.List; -import org.droidplanner.checklist.row.ListRow_Interface; - import org.droidplanner.R; +import org.droidplanner.checklist.row.ListRow_Interface; import android.graphics.Typeface; import android.view.LayoutInflater; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/BaseViewHolder.java b/DroidPlanner/src/org/droidplanner/checklist/row/BaseViewHolder.java index a8b895f2e4..c1074f03cd 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/BaseViewHolder.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/BaseViewHolder.java @@ -1,8 +1,7 @@ package org.droidplanner.checklist.row; -import org.droidplanner.checklist.CheckListItem; - import org.droidplanner.R; +import org.droidplanner.checklist.CheckListItem; import android.view.ViewGroup; import android.widget.CheckBox; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_CheckBox.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_CheckBox.java index eb0ad1b6cf..b9f0c6d829 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_CheckBox.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_CheckBox.java @@ -1,8 +1,8 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Level.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Level.java index 3658548f30..306a899121 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Level.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Level.java @@ -1,8 +1,8 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Note.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Note.java index ea477d9403..8a2006238a 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Note.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Note.java @@ -1,8 +1,7 @@ package org.droidplanner.checklist.row; -import org.droidplanner.checklist.CheckListItem; - import org.droidplanner.R; +import org.droidplanner.checklist.CheckListItem; import android.view.LayoutInflater; import android.view.View; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Radio.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Radio.java index 1db45267a8..daf049feb0 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Radio.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Radio.java @@ -2,9 +2,9 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Select.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Select.java index 01d0100efd..9ee49ffd47 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Select.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Select.java @@ -1,8 +1,8 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Switch.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Switch.java index 49b09cdbfb..7d4390b315 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Switch.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Switch.java @@ -1,8 +1,8 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Toggle.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Toggle.java index 96583147ba..c672c54cfe 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Toggle.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Toggle.java @@ -1,14 +1,14 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; -import android.widget.ToggleButton; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.ToggleButton; public class ListRow_Toggle extends ListRow implements OnCheckedChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Value.java b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Value.java index 4ed9c6a59e..c6bd9db000 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Value.java +++ b/DroidPlanner/src/org/droidplanner/checklist/row/ListRow_Value.java @@ -1,8 +1,8 @@ package org.droidplanner.checklist.row; +import org.droidplanner.R; import org.droidplanner.checklist.CheckListItem; -import org.droidplanner.R; import android.text.InputType; import android.view.LayoutInflater; import android.view.View; diff --git a/DroidPlanner/src/org/droidplanner/checklist/xml/ListXmlParser.java b/DroidPlanner/src/org/droidplanner/checklist/xml/ListXmlParser.java index e834d65830..d107bba8fa 100644 --- a/DroidPlanner/src/org/droidplanner/checklist/xml/ListXmlParser.java +++ b/DroidPlanner/src/org/droidplanner/checklist/xml/ListXmlParser.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.StringReader; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; diff --git a/DroidPlanner/src/org/droidplanner/connection/BluetoothConnection.java b/DroidPlanner/src/org/droidplanner/connection/BluetoothConnection.java index 2398b1ce50..83fa40fc38 100644 --- a/DroidPlanner/src/org/droidplanner/connection/BluetoothConnection.java +++ b/DroidPlanner/src/org/droidplanner/connection/BluetoothConnection.java @@ -1,5 +1,14 @@ package org.droidplanner.connection; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.UnknownHostException; +import java.util.Set; +import java.util.UUID; + +import org.droidplanner.utils.Constants; + import android.annotation.SuppressLint; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -9,14 +18,6 @@ import android.os.ParcelUuid; import android.preference.PreferenceManager; import android.util.Log; -import org.droidplanner.utils.Constants; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.UnknownHostException; -import java.util.Set; -import java.util.UUID; public class BluetoothConnection extends MAVLinkConnection { private static final String BLUE = "BLUETOOTH"; diff --git a/DroidPlanner/src/org/droidplanner/connection/UsbConnection.java b/DroidPlanner/src/org/droidplanner/connection/UsbConnection.java index 9e601e1000..7d6c256803 100644 --- a/DroidPlanner/src/org/droidplanner/connection/UsbConnection.java +++ b/DroidPlanner/src/org/droidplanner/connection/UsbConnection.java @@ -3,19 +3,19 @@ import java.io.IOException; import java.net.UnknownHostException; +import android.content.Context; +import android.content.SharedPreferences; +import android.hardware.usb.UsbManager; +import android.util.Log; + +import com.hoho.android.usbserial.driver.UsbSerialDriver; +import com.hoho.android.usbserial.driver.UsbSerialProber; //This version is modified by Helibot to use the "USB Serial for Android Library" //See https://code.google.com/p/usb-serial-for-android/ // It should allow support of FDTI and other Serial to USB converters. // It should allow APM v2.0 and 2.5 to connect via USB cable straight to APM. // Be sure to set the Telementry speed in the setting menu to // 115200 when connecting directly with USB cable. -import com.hoho.android.usbserial.driver.UsbSerialDriver; -import com.hoho.android.usbserial.driver.UsbSerialProber; -import android.hardware.usb.UsbManager; - -import android.content.Context; -import android.content.SharedPreferences; -import android.util.Log; public class UsbConnection extends MAVLinkConnection { private static int baud_rate = 57600; diff --git a/DroidPlanner/src/org/droidplanner/dialogs/AltitudeDialog.java b/DroidPlanner/src/org/droidplanner/dialogs/AltitudeDialog.java index 24d6d5989a..4b9ccd2683 100644 --- a/DroidPlanner/src/org/droidplanner/dialogs/AltitudeDialog.java +++ b/DroidPlanner/src/org/droidplanner/dialogs/AltitudeDialog.java @@ -1,5 +1,6 @@ package org.droidplanner.dialogs; +import org.droidplanner.R; import org.droidplanner.helpers.units.Altitude; import android.app.AlertDialog; @@ -10,7 +11,6 @@ import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.NumberPicker; -import org.droidplanner.R; public class AltitudeDialog implements DialogInterface.OnClickListener { private NumberPicker thousandPicker; diff --git a/DroidPlanner/src/org/droidplanner/dialogs/openfile/OpenFileDialog.java b/DroidPlanner/src/org/droidplanner/dialogs/openfile/OpenFileDialog.java index 8be7032980..2f88004f24 100644 --- a/DroidPlanner/src/org/droidplanner/dialogs/openfile/OpenFileDialog.java +++ b/DroidPlanner/src/org/droidplanner/dialogs/openfile/OpenFileDialog.java @@ -1,13 +1,13 @@ package org.droidplanner.dialogs.openfile; +import org.droidplanner.R; + import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.widget.Toast; -import org.droidplanner.R; - public abstract class OpenFileDialog implements OnClickListener { public interface FileReader { diff --git a/DroidPlanner/src/org/droidplanner/dialogs/parameters/DialogParameterInfo.java b/DroidPlanner/src/org/droidplanner/dialogs/parameters/DialogParameterInfo.java index 71e7455ee4..91b4c43ca7 100644 --- a/DroidPlanner/src/org/droidplanner/dialogs/parameters/DialogParameterInfo.java +++ b/DroidPlanner/src/org/droidplanner/dialogs/parameters/DialogParameterInfo.java @@ -1,24 +1,26 @@ package org.droidplanner.dialogs.parameters; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.*; - -import org.droidplanner.R; - import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.droidplanner.R; import org.droidplanner.adapters.ParamsAdapterItem; import org.droidplanner.parameters.Parameter; import org.droidplanner.parameters.ParameterMetadata; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.EditText; +import android.widget.Spinner; +import android.widget.TextView; + public class DialogParameterInfo { diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Battery.java b/DroidPlanner/src/org/droidplanner/drone/variables/Battery.java index 13a62fe96c..525f7d4fc3 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Battery.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Battery.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; public class Battery extends DroneVariable { private double battVolt = -1; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Calibration.java b/DroidPlanner/src/org/droidplanner/drone/variables/Calibration.java index 0656db2e49..98989dd864 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Calibration.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Calibration.java @@ -2,8 +2,8 @@ import org.droidplanner.MAVLink.MavLinkCalibration; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.ardupilotmega.msg_statustext; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/GPS.java b/DroidPlanner/src/org/droidplanner/drone/variables/GPS.java index b1dde56460..e1e3028fe0 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/GPS.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/GPS.java @@ -1,10 +1,9 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; -import com.google.android.gms.internal.fi; import com.google.android.gms.maps.model.LatLng; public class GPS extends DroneVariable { diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/HeartBeat.java b/DroidPlanner/src/org/droidplanner/drone/variables/HeartBeat.java index 1967ffe133..bae3377742 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/HeartBeat.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/HeartBeat.java @@ -5,10 +5,10 @@ import org.droidplanner.drone.DroneInterfaces.OnDroneListener; import org.droidplanner.drone.DroneVariable; -import com.MAVLink.Messages.ardupilotmega.msg_heartbeat; - import android.os.Handler; +import com.MAVLink.Messages.ardupilotmega.msg_heartbeat; + public class HeartBeat extends DroneVariable implements OnDroneListener { private static long HEARTBEAT_NORMAL_TIMEOUT = 5000; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Home.java b/DroidPlanner/src/org/droidplanner/drone/variables/Home.java index 91a28981a1..903c7c3910 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Home.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Home.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import org.droidplanner.fragments.markers.HomeMarker; import org.droidplanner.fragments.markers.MarkerManager.MarkerSource; import org.droidplanner.helpers.geoTools.GeoTools; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Navigation.java b/DroidPlanner/src/org/droidplanner/drone/variables/Navigation.java index 37a20d0eb2..0e67dcb0d6 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Navigation.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Navigation.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; public class Navigation extends DroneVariable { diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Orientation.java b/DroidPlanner/src/org/droidplanner/drone/variables/Orientation.java index 752b0f8754..e7b956a75c 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Orientation.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Orientation.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; public class Orientation extends DroneVariable { private double roll = 0; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Parameters.java b/DroidPlanner/src/org/droidplanner/drone/variables/Parameters.java index 04739b35a9..b697207dd2 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Parameters.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Parameters.java @@ -6,8 +6,8 @@ import org.droidplanner.MAVLink.MavLinkParameters; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import org.droidplanner.parameters.Parameter; import com.MAVLink.Messages.MAVLinkMessage; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Profile.java b/DroidPlanner/src/org/droidplanner/drone/variables/Profile.java index ddd97d1d0a..0ac2795bd1 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Profile.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Profile.java @@ -8,6 +8,7 @@ import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.view.View; + import com.MAVLink.Messages.enums.MAV_TYPE; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/RC.java b/DroidPlanner/src/org/droidplanner/drone/variables/RC.java index 3a45c220b6..9c9cec591b 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/RC.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/RC.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import com.MAVLink.Messages.ardupilotmega.msg_rc_channels_raw; import com.MAVLink.Messages.ardupilotmega.msg_servo_output_raw; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Radio.java b/DroidPlanner/src/org/droidplanner/drone/variables/Radio.java index 9449b25955..e711a70137 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Radio.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Radio.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import org.droidplanner.helpers.math.MathUtil; public class Radio extends DroneVariable { diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/State.java b/DroidPlanner/src/org/droidplanner/drone/variables/State.java index 083f780fb0..b2a068f3f1 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/State.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/State.java @@ -2,8 +2,8 @@ import org.droidplanner.MAVLink.MavLinkModes; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import android.os.SystemClock; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/Type.java b/DroidPlanner/src/org/droidplanner/drone/variables/Type.java index e3ae9c9e3c..c34278e83e 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/Type.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/Type.java @@ -1,8 +1,8 @@ package org.droidplanner.drone.variables; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; +import org.droidplanner.drone.DroneVariable; import com.MAVLink.Messages.enums.MAV_TYPE; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/WaypointMananger.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/WaypointMananger.java index 11f101eb2b..38824e8368 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/WaypointMananger.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/WaypointMananger.java @@ -5,8 +5,8 @@ import org.droidplanner.MAVLink.MavLinkWaypoint; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneVariable; import org.droidplanner.drone.DroneInterfaces.OnWaypointManagerListener; +import org.droidplanner.drone.DroneVariable; import android.util.Log; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/CircumscribedGrid.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/CircumscribedGrid.java index 546089cf5c..69df71340e 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/CircumscribedGrid.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/CircumscribedGrid.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; +import org.droidplanner.R; import org.droidplanner.helpers.geoTools.GeoTools; import org.droidplanner.helpers.geoTools.LineLatLng; import org.droidplanner.polygon.PolyBounds; import android.content.Context; -import org.droidplanner.R; import com.google.android.gms.maps.model.LatLng; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/GridBuilder.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/GridBuilder.java index cb88566f81..09db06ae9c 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/GridBuilder.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/survey/grid/GridBuilder.java @@ -6,12 +6,10 @@ import org.droidplanner.helpers.geoTools.LineLatLng; import org.droidplanner.polygon.Polygon; - +import android.content.Context; import com.google.android.gms.maps.model.LatLng; -import android.content.Context; - public class GridBuilder { private Polygon poly; diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Loiter.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Loiter.java index 0e7f615ca7..5a96907dd1 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Loiter.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Loiter.java @@ -2,6 +2,7 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.Mission; import org.droidplanner.drone.variables.mission.MissionItem; import org.droidplanner.fragments.markers.MarkerManager.MarkerSource; @@ -9,7 +10,6 @@ import org.droidplanner.helpers.units.Altitude; import com.MAVLink.Messages.ardupilotmega.msg_mission_item; -import org.droidplanner.R; import com.google.android.gms.maps.model.LatLng; public abstract class Loiter extends SpatialCoordItem implements MarkerSource { diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/RegionOfInterest.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/RegionOfInterest.java index ff1dde2dac..4990d5dc8e 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/RegionOfInterest.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/RegionOfInterest.java @@ -2,13 +2,13 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.MissionItem; import org.droidplanner.fragments.markers.MarkerManager.MarkerSource; import org.droidplanner.fragments.mission.MissionDetailFragment; import org.droidplanner.fragments.mission.MissionRegionOfInterestFragment; import com.MAVLink.Messages.ardupilotmega.msg_mission_item; -import org.droidplanner.R; import com.google.android.gms.maps.model.LatLng; public class RegionOfInterest extends SpatialCoordItem implements MarkerSource{ diff --git a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Waypoint.java b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Waypoint.java index 72db8a1195..cce48d5bcc 100644 --- a/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Waypoint.java +++ b/DroidPlanner/src/org/droidplanner/drone/variables/mission/waypoints/Waypoint.java @@ -3,6 +3,7 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.Mission; import org.droidplanner.drone.variables.mission.MissionItem; import org.droidplanner.fragments.mission.MissionDetailFragment; @@ -11,7 +12,6 @@ import com.MAVLink.Messages.ardupilotmega.msg_mission_item; import com.MAVLink.Messages.enums.MAV_CMD; -import org.droidplanner.R; import com.google.android.gms.maps.model.LatLng; public class Waypoint extends SpatialCoordItem { diff --git a/DroidPlanner/src/org/droidplanner/file/AssetUtil.java b/DroidPlanner/src/org/droidplanner/file/AssetUtil.java index 6dc4986c93..6d379a4dc6 100644 --- a/DroidPlanner/src/org/droidplanner/file/AssetUtil.java +++ b/DroidPlanner/src/org/droidplanner/file/AssetUtil.java @@ -1,10 +1,10 @@ package org.droidplanner.file; -import android.content.res.AssetManager; - import java.io.IOException; +import android.content.res.AssetManager; + public class AssetUtil { public static boolean exists(AssetManager assetManager, String directory, String fileName) throws IOException { diff --git a/DroidPlanner/src/org/droidplanner/file/IO/MissionReader.java b/DroidPlanner/src/org/droidplanner/file/IO/MissionReader.java index 92e0b8faa4..10467a5c39 100644 --- a/DroidPlanner/src/org/droidplanner/file/IO/MissionReader.java +++ b/DroidPlanner/src/org/droidplanner/file/IO/MissionReader.java @@ -14,8 +14,6 @@ import org.droidplanner.file.FileList; import org.droidplanner.file.FileManager; -import com.MAVLink.Messages.ApmCommands; - public class MissionReader implements FileReader { private Home home; private List waypoints; diff --git a/DroidPlanner/src/org/droidplanner/file/IO/ParameterMetadataMapReader.java b/DroidPlanner/src/org/droidplanner/file/IO/ParameterMetadataMapReader.java index 45c57fbc5a..ad5adf3225 100644 --- a/DroidPlanner/src/org/droidplanner/file/IO/ParameterMetadataMapReader.java +++ b/DroidPlanner/src/org/droidplanner/file/IO/ParameterMetadataMapReader.java @@ -1,15 +1,18 @@ package org.droidplanner.file.IO; -import android.content.Context; -import android.util.Xml; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; import org.droidplanner.file.DirectoryPath; import org.droidplanner.parameters.ParameterMetadata; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.*; -import java.util.Map; +import android.content.Context; +import android.util.Xml; /** diff --git a/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfile.java b/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfile.java index 4bfd2577fc..cbe680c2d3 100644 --- a/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfile.java +++ b/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfile.java @@ -1,8 +1,5 @@ package org.droidplanner.file.IO; -import android.view.View; -import android.widget.TextView; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -10,6 +7,9 @@ import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; +import android.view.View; +import android.widget.TextView; + public class VehicleProfile { private String parameterMetadataType; diff --git a/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfileReader.java b/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfileReader.java index 1a6bd12abd..c0eaee2a20 100644 --- a/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfileReader.java +++ b/DroidPlanner/src/org/droidplanner/file/IO/VehicleProfileReader.java @@ -1,21 +1,21 @@ package org.droidplanner.file.IO; -import android.content.Context; -import android.content.res.AssetManager; -import android.util.Xml; -import android.view.View; -import org.droidplanner.R; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import org.droidplanner.R; import org.droidplanner.file.AssetUtil; import org.droidplanner.file.DirectoryPath; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; +import android.content.Context; +import android.content.res.AssetManager; +import android.util.Xml; +import android.view.View; public class VehicleProfileReader { diff --git a/DroidPlanner/src/org/droidplanner/fragments/ChecklistFragment.java b/DroidPlanner/src/org/droidplanner/fragments/ChecklistFragment.java index 6b5959aab5..a06e5bbf24 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/ChecklistFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/ChecklistFragment.java @@ -4,14 +4,13 @@ import java.util.HashMap; import java.util.List; -import android.support.v4.app.Fragment; - +import org.droidplanner.R; import org.droidplanner.activities.helpers.SuperActivity; import org.droidplanner.checklist.CheckListAdapter; +import org.droidplanner.checklist.CheckListAdapter.OnCheckListItemUpdateListener; import org.droidplanner.checklist.CheckListItem; import org.droidplanner.checklist.CheckListSysLink; import org.droidplanner.checklist.CheckListXmlParser; -import org.droidplanner.checklist.CheckListAdapter.OnCheckListItemUpdateListener; import org.droidplanner.checklist.xml.ListXmlParser.OnXmlParserError; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; @@ -21,13 +20,12 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ExpandableListView; -import org.droidplanner.R; - public class ChecklistFragment extends Fragment implements OnXmlParserError, OnCheckListItemUpdateListener, OnDroneListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/EditorListFragment.java b/DroidPlanner/src/org/droidplanner/fragments/EditorListFragment.java index ffb7d21c9b..9d69005310 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/EditorListFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/EditorListFragment.java @@ -1,6 +1,5 @@ package org.droidplanner.fragments; -import android.support.v4.app.Fragment; import it.sephiroth.android.library.widget.AdapterView; import it.sephiroth.android.library.widget.AdapterView.OnItemClickListener; import it.sephiroth.android.library.widget.AdapterView.OnItemLongClickListener; @@ -10,6 +9,7 @@ import java.util.List; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.activities.helpers.OnEditorInteraction; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; @@ -20,6 +20,7 @@ import android.app.Activity; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.util.SparseBooleanArray; import android.view.LayoutInflater; import android.view.View; @@ -28,8 +29,6 @@ import android.widget.ImageButton; import android.widget.ListView; -import org.droidplanner.R; - public class EditorListFragment extends Fragment implements OnItemLongClickListener, OnItemClickListener, OnDroneListener, OnClickListener{ private HListView list; private Mission mission; diff --git a/DroidPlanner/src/org/droidplanner/fragments/EditorToolsFragment.java b/DroidPlanner/src/org/droidplanner/fragments/EditorToolsFragment.java index bcc85ef82b..77facdc44e 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/EditorToolsFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/EditorToolsFragment.java @@ -1,5 +1,8 @@ package org.droidplanner.fragments; +import org.droidplanner.R; +import org.droidplanner.widgets.button.RadioButtonCenter; + import android.app.Activity; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -7,11 +10,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.widget.RadioButton; - import android.widget.RadioGroup; -import org.droidplanner.R; -import org.droidplanner.widgets.button.RadioButtonCenter; public class EditorToolsFragment extends Fragment implements OnClickListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/FlightActionsFragment.java b/DroidPlanner/src/org/droidplanner/fragments/FlightActionsFragment.java index a20ab5f526..6941364037 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/FlightActionsFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/FlightActionsFragment.java @@ -1,6 +1,7 @@ package org.droidplanner.fragments; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.drone.Drone; import android.app.Activity; @@ -13,7 +14,6 @@ import android.widget.Button; import com.MAVLink.Messages.ApmModes; -import org.droidplanner.R; public class FlightActionsFragment extends Fragment implements OnClickListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/ParamsFragment.java b/DroidPlanner/src/org/droidplanner/fragments/ParamsFragment.java index 25d2e928e2..351856dac5 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/ParamsFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/ParamsFragment.java @@ -6,6 +6,7 @@ import java.util.List; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.adapters.ParamsAdapter; import org.droidplanner.adapters.ParamsAdapterItem; import org.droidplanner.dialogs.openfile.OpenFileDialog; @@ -31,8 +32,6 @@ import android.widget.EditText; import android.widget.Toast; -import org.droidplanner.R; - public class ParamsFragment extends ListFragment implements DroneInterfaces .OnParameterManagerListener, OnDroneListener{ diff --git a/DroidPlanner/src/org/droidplanner/fragments/RCFragment.java b/DroidPlanner/src/org/droidplanner/fragments/RCFragment.java index e10ea99c5b..53ef78a4cd 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/RCFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/RCFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments; +import org.droidplanner.R; import org.droidplanner.widgets.joystick.JoystickMovedListener; import org.droidplanner.widgets.joystick.JoystickView; @@ -14,8 +15,6 @@ import android.view.ViewGroup; import android.widget.TextView; -import org.droidplanner.R; - public class RCFragment extends Fragment { private JoystickView joystickL, joystickR; diff --git a/DroidPlanner/src/org/droidplanner/fragments/SettingsFragment.java b/DroidPlanner/src/org/droidplanner/fragments/SettingsFragment.java index c9c3ce83e5..b4d9b0ceee 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/SettingsFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/SettingsFragment.java @@ -1,9 +1,11 @@ package org.droidplanner.fragments; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.activities.ConfigurationActivity; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.file.DirectoryPath; +import org.droidplanner.utils.Constants; import android.content.Context; import android.content.Intent; @@ -17,9 +19,6 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceManager; -import org.droidplanner.R; -import org.droidplanner.utils.Constants; - public class SettingsFragment extends PreferenceFragment implements OnSharedPreferenceChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/SetupRadioFragment.java b/DroidPlanner/src/org/droidplanner/fragments/SetupRadioFragment.java index 56ab72ca0e..ffcccba616 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/SetupRadioFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/SetupRadioFragment.java @@ -10,7 +10,6 @@ import org.droidplanner.fragments.calibration.sf.FragmentSetupSF; import org.droidplanner.fragments.helpers.SuperSetupFragment; -import android.app.Activity; import android.os.Bundle; /** diff --git a/DroidPlanner/src/org/droidplanner/fragments/TelemetryFragment.java b/DroidPlanner/src/org/droidplanner/fragments/TelemetryFragment.java index 0e72d4ac78..940dd0ce19 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/TelemetryFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/TelemetryFragment.java @@ -1,6 +1,7 @@ package org.droidplanner.fragments; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; @@ -15,8 +16,6 @@ import android.view.ViewGroup; import android.widget.TextView; -import org.droidplanner.R; - public class TelemetryFragment extends Fragment implements OnDroneListener{ private AttitudeIndicator attitudeIndicator; diff --git a/DroidPlanner/src/org/droidplanner/fragments/TuningFragment.java b/DroidPlanner/src/org/droidplanner/fragments/TuningFragment.java index 9d0f6ff6ed..a892763b90 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/TuningFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/TuningFragment.java @@ -1,6 +1,7 @@ package org.droidplanner.fragments; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.MAVLink.MavLinkStreamRates; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; @@ -17,8 +18,6 @@ import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - /** * This fragment is used to tune the roll and pitch of the drone. */ diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupNext.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupNext.java index 0f5cfd7985..a75dc006ec 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupNext.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupNext.java @@ -1,18 +1,16 @@ package org.droidplanner.fragments.calibration; +import org.droidplanner.R; import org.droidplanner.fragments.SetupRadioFragment; -import org.droidplanner.fragments.calibration.SetupSidePanel; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.droidplanner.R; - public class FragmentSetupNext extends SetupSidePanel { private int titleId=0,descId=0; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupProgress.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupProgress.java index 3a7a5ae4f0..4f1d8a514b 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupProgress.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupProgress.java @@ -1,8 +1,8 @@ package org.droidplanner.fragments.calibration; +import org.droidplanner.R; import org.droidplanner.fragments.helpers.SuperSetupFragment; -import org.droidplanner.R; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSend.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSend.java index 6df2b18d77..18461bd6b8 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSend.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSend.java @@ -1,18 +1,16 @@ package org.droidplanner.fragments.calibration; +import org.droidplanner.R; import org.droidplanner.fragments.SetupRadioFragment; -import org.droidplanner.fragments.calibration.SetupSidePanel; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.droidplanner.R; - public class FragmentSetupSend extends SetupSidePanel { private int titleId=0,descId=0; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupStart.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupStart.java index 72ea1bd32a..2c90be0a70 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupStart.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupStart.java @@ -1,18 +1,16 @@ package org.droidplanner.fragments.calibration; +import org.droidplanner.R; import org.droidplanner.fragments.SetupRadioFragment; -import org.droidplanner.fragments.calibration.SetupSidePanel; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.droidplanner.R; - public class FragmentSetupStart extends SetupSidePanel { private TextView textTitle; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSummary.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSummary.java index 278c1faf0e..0c434e15d0 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSummary.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/FragmentSetupSummary.java @@ -1,9 +1,8 @@ package org.droidplanner.fragments.calibration; +import org.droidplanner.R; import org.droidplanner.fragments.SetupRadioFragment; -import org.droidplanner.fragments.calibration.SetupSidePanel; -import org.droidplanner.R; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/SetupMainPanel.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/SetupMainPanel.java index 53567b67e8..bfb4a8d939 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/SetupMainPanel.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/SetupMainPanel.java @@ -1,6 +1,7 @@ package org.droidplanner.fragments.calibration; import org.droidplanner.activities.ConfigurationActivity; + import android.app.Activity; import android.os.Bundle; import android.support.v4.app.Fragment; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/flightmodes/FragmentSetupFM.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/flightmodes/FragmentSetupFM.java index 4c017703bf..2d5e8c4d6b 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/flightmodes/FragmentSetupFM.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/flightmodes/FragmentSetupFM.java @@ -1,6 +1,6 @@ package org.droidplanner.fragments.calibration.flightmodes; -import android.widget.TableRow; +import org.droidplanner.R; import org.droidplanner.calibration.CalParameters; import org.droidplanner.calibration.FM_CalParameters; import org.droidplanner.drone.Drone; @@ -8,13 +8,13 @@ import org.droidplanner.fragments.calibration.FragmentSetupSend; import org.droidplanner.fragments.calibration.SetupSidePanel; import org.droidplanner.fragments.helpers.SuperSetupMainPanel; -import org.droidplanner.R; import android.view.View; import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.Spinner; +import android.widget.TableRow; import android.widget.TextView; public class FragmentSetupFM extends SuperSetupMainPanel { diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMU.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMU.java index 087cd3f8b4..35ca2bff34 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMU.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMU.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.calibration.imu; +import org.droidplanner.R; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; @@ -13,7 +14,6 @@ import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import org.droidplanner.R; public class FragmentSetupIMU extends SetupMainPanel implements OnDroneListener{ diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMUCalibrate.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMUCalibrate.java index 99c99ed5bd..48b8162819 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMUCalibrate.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/imu/FragmentSetupIMUCalibrate.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.calibration.imu; +import org.droidplanner.R; import org.droidplanner.fragments.SetupSensorFragment; import org.droidplanner.fragments.calibration.SetupSidePanel; @@ -10,7 +11,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import org.droidplanner.R; public class FragmentSetupIMUCalibrate extends SetupSidePanel { private Button btnStep; diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/mag/FragmentSetupMAG.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/mag/FragmentSetupMAG.java index 8306447fb0..643a295c64 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/mag/FragmentSetupMAG.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/mag/FragmentSetupMAG.java @@ -1,9 +1,9 @@ package org.droidplanner.fragments.calibration.mag; +import org.droidplanner.R; import org.droidplanner.fragments.calibration.SetupMainPanel; import org.droidplanner.fragments.calibration.SetupSidePanel; -import org.droidplanner.R; import android.view.View; public class FragmentSetupMAG extends SetupMainPanel { diff --git a/DroidPlanner/src/org/droidplanner/fragments/calibration/rc/FragmentSetupRC.java b/DroidPlanner/src/org/droidplanner/fragments/calibration/rc/FragmentSetupRC.java index 747a31219a..fc7bad7d63 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/calibration/rc/FragmentSetupRC.java +++ b/DroidPlanner/src/org/droidplanner/fragments/calibration/rc/FragmentSetupRC.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.calibration.rc; +import org.droidplanner.R; import org.droidplanner.calibration.CalParameters; import org.droidplanner.calibration.RC_CalParameters; import org.droidplanner.drone.Drone; @@ -14,8 +15,6 @@ import org.droidplanner.widgets.FillBar.FillBar; import org.droidplanner.widgets.RcStick.RcStick; -import org.droidplanner.R; - import android.os.Bundle; import android.view.View; import android.widget.TextView; diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/BTDeviceListFragment.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/BTDeviceListFragment.java index 9d37f8cb37..0faf053bbc 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/BTDeviceListFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/BTDeviceListFragment.java @@ -1,5 +1,11 @@ package org.droidplanner.fragments.helpers; +import java.util.Set; + +import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; +import org.droidplanner.utils.Constants; + import android.app.Activity; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -20,11 +26,6 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import org.droidplanner.DroidPlannerApp; -import org.droidplanner.R; -import org.droidplanner.utils.Constants; - -import java.util.Set; /** * This is used to show the user a list of bluetooth devices to connect to. diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/FlightSlidingDrawerContent.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/FlightSlidingDrawerContent.java index 2b9ac001e2..6b85862508 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/FlightSlidingDrawerContent.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/FlightSlidingDrawerContent.java @@ -1,5 +1,9 @@ package org.droidplanner.fragments.helpers; +import org.droidplanner.R; +import org.droidplanner.fragments.TelemetryFragment; +import org.droidplanner.fragments.mode.FlightModePanel; + import android.content.Context; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -9,10 +13,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; -import org.droidplanner.fragments.TelemetryFragment; -import org.droidplanner.fragments.mode.FlightModePanel; -import org.droidplanner.widgets.viewPager.TabPageIndicator; /** * @author Fredia Huya-Kouadio diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/GestureMapFragment.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/GestureMapFragment.java index 888ac41f69..5a22e65659 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/GestureMapFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/GestureMapFragment.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import org.droidplanner.R; import org.droidplanner.helpers.geoTools.Simplify; import android.gesture.GestureOverlayView; @@ -15,8 +16,6 @@ import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class GestureMapFragment extends Fragment implements OnGestureListener { private static final int TOLERANCE = 15; private static final int STROKE_WIDTH = 3; diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/GuidePointListener.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/GuidePointListener.java index c63207f2e3..29b90cc3e6 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/GuidePointListener.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/GuidePointListener.java @@ -1,8 +1,5 @@ package org.droidplanner.fragments.helpers; -import org.droidplanner.drone.variables.GuidedPoint; - -import com.google.android.gms.maps.model.LatLng; /** * Created with IntelliJ IDEA. diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/HelpDialogFragment.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/HelpDialogFragment.java index 98d92a2868..f0f7efe05c 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/HelpDialogFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/HelpDialogFragment.java @@ -1,5 +1,8 @@ package org.droidplanner.fragments.helpers; +import org.droidplanner.R; +import org.droidplanner.activities.interfaces.HelpProvider; + import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -9,9 +12,6 @@ import android.os.Bundle; import android.support.v4.app.DialogFragment; -import org.droidplanner.R; -import org.droidplanner.activities.interfaces.HelpProvider; - /** * Used to show the help options to the user. */ diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/OfflineMapFragment.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/OfflineMapFragment.java index 3b7ddc42d6..bdfd7bbdea 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/OfflineMapFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/OfflineMapFragment.java @@ -1,5 +1,9 @@ package org.droidplanner.fragments.helpers; +import java.util.List; + +import org.droidplanner.helpers.LocalMapTileProvider; + import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; @@ -7,6 +11,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; @@ -17,10 +22,6 @@ import com.google.android.gms.maps.model.TileOverlay; import com.google.android.gms.maps.model.TileOverlayOptions; -import java.util.List; - -import org.droidplanner.helpers.LocalMapTileProvider; - public class OfflineMapFragment extends SupportMapFragment { public static final String PREF_MAP_TYPE = "pref_map_type"; diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupFragment.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupFragment.java index 56faaf90ea..8587cf38da 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupFragment.java @@ -1,12 +1,14 @@ package org.droidplanner.fragments.helpers; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.activities.ConfigurationActivity; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import org.droidplanner.drone.DroneInterfaces.OnDroneListener; import org.droidplanner.fragments.calibration.SetupMainPanel; import org.droidplanner.fragments.calibration.SetupSidePanel; + import android.app.Activity; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -19,9 +21,6 @@ import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; import android.widget.Spinner; -import android.widget.TextView; - -import org.droidplanner.R; /** * This fragment is used to calibrate the drone's compass, and accelerometer. diff --git a/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupMainPanel.java b/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupMainPanel.java index 93b863cc26..71a2fb17f1 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupMainPanel.java +++ b/DroidPlanner/src/org/droidplanner/fragments/helpers/SuperSetupMainPanel.java @@ -8,7 +8,6 @@ import org.droidplanner.drone.DroneInterfaces.OnDroneListener; import org.droidplanner.fragments.SetupRadioFragment; import org.droidplanner.fragments.calibration.FragmentSetupProgress; -import org.droidplanner.fragments.calibration.FragmentSetupSend; import org.droidplanner.fragments.calibration.SetupMainPanel; import org.droidplanner.fragments.calibration.SetupSidePanel; diff --git a/DroidPlanner/src/org/droidplanner/fragments/markers/GcpMarker.java b/DroidPlanner/src/org/droidplanner/fragments/markers/GcpMarker.java index 45c91e97e2..9de2da1c51 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/markers/GcpMarker.java +++ b/DroidPlanner/src/org/droidplanner/fragments/markers/GcpMarker.java @@ -1,8 +1,8 @@ package org.droidplanner.fragments.markers; +import org.droidplanner.R; import org.droidplanner.gcp.Gcp; -import org.droidplanner.R; import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.Marker; diff --git a/DroidPlanner/src/org/droidplanner/fragments/markers/GuidedMarker.java b/DroidPlanner/src/org/droidplanner/fragments/markers/GuidedMarker.java index e97a1e329b..dd50be03e9 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/markers/GuidedMarker.java +++ b/DroidPlanner/src/org/droidplanner/fragments/markers/GuidedMarker.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.markers; +import org.droidplanner.R; import org.droidplanner.drone.variables.GuidedPoint; import org.droidplanner.fragments.markers.helpers.MarkerWithText; import org.droidplanner.helpers.units.Altitude; import android.content.Context; -import org.droidplanner.R; import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.Marker; diff --git a/DroidPlanner/src/org/droidplanner/fragments/markers/HomeMarker.java b/DroidPlanner/src/org/droidplanner/fragments/markers/HomeMarker.java index 4860205f77..c26f72eb22 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/markers/HomeMarker.java +++ b/DroidPlanner/src/org/droidplanner/fragments/markers/HomeMarker.java @@ -1,8 +1,8 @@ package org.droidplanner.fragments.markers; +import org.droidplanner.R.drawable; import org.droidplanner.drone.variables.Home; -import org.droidplanner.R.drawable; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; diff --git a/DroidPlanner/src/org/droidplanner/fragments/markers/helpers/MarkerWithText.java b/DroidPlanner/src/org/droidplanner/fragments/markers/helpers/MarkerWithText.java index cfc7a3b2b2..539c642174 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/markers/helpers/MarkerWithText.java +++ b/DroidPlanner/src/org/droidplanner/fragments/markers/helpers/MarkerWithText.java @@ -1,11 +1,16 @@ package org.droidplanner.fragments.markers.helpers; +import org.droidplanner.R; + import android.content.Context; import android.content.res.Resources; -import android.graphics.*; -import android.graphics.Paint.Align; - -import org.droidplanner.R; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.LightingColorFilter; +import android.graphics.Paint; +import android.graphics.Rect; public class MarkerWithText { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionDetailFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionDetailFragment.java index 039e6e61e9..533797c3a7 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionDetailFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionDetailFragment.java @@ -1,6 +1,7 @@ package org.droidplanner.fragments.mission; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.activities.EditorActivity; import org.droidplanner.drone.variables.mission.Mission; import org.droidplanner.drone.variables.mission.MissionItem; @@ -16,10 +17,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.TextView; import android.widget.AdapterView.OnItemSelectedListener; - -import org.droidplanner.R; +import android.widget.TextView; public abstract class MissionDetailFragment extends DialogFragment implements OnItemSelectedListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLandFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLandFragment.java index fe69eb1e49..0d283fff93 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLandFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLandFragment.java @@ -1,12 +1,11 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Land; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText.OnTextSeekBarChangedListener; import android.view.View; -import org.droidplanner.R; - public class MissionLandFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterFragment.java index bcf95b3031..4fcc7a643e 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Loiter; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText.OnTextSeekBarChangedListener; @@ -7,8 +8,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import org.droidplanner.R; - public class MissionLoiterFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener, OnCheckedChangeListener{ diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java index 63001d549a..8a63f2bb25 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterNFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Loiter; import org.droidplanner.drone.variables.mission.waypoints.LoiterTurns; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; @@ -10,8 +11,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import org.droidplanner.R; - public class MissionLoiterNFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener, OnCheckedChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java index c793c1af5a..9c9a83374d 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionLoiterTFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Loiter; import org.droidplanner.drone.variables.mission.waypoints.LoiterTime; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; @@ -9,8 +10,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import org.droidplanner.R; - public class MissionLoiterTFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener, OnCheckedChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java index 0c1f5df904..8647733812 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRTLFragment.java @@ -1,11 +1,10 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText.OnTextSeekBarChangedListener; import android.view.View; -import org.droidplanner.R; - public class MissionRTLFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener { //private SeekBarWithText altitudeSeekBar; diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java index 81bf617273..bc03324ddd 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionRegionOfInterestFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.RegionOfInterest; import org.droidplanner.helpers.units.Altitude; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; @@ -7,8 +8,6 @@ import android.view.View; -import org.droidplanner.R; - public class MissionRegionOfInterestFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionTakeoffFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionTakeoffFragment.java index ea37941163..0893b260c9 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionTakeoffFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionTakeoffFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Takeoff; import org.droidplanner.helpers.units.Altitude; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; @@ -7,8 +8,6 @@ import android.view.View; -import org.droidplanner.R; - public class MissionTakeoffFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener { private SeekBarWithText altitudeSeekBar; diff --git a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionWaypointFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionWaypointFragment.java index 85f5a90473..7e22424ac7 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mission/MissionWaypointFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mission/MissionWaypointFragment.java @@ -1,5 +1,6 @@ package org.droidplanner.fragments.mission; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.Waypoint; import org.droidplanner.helpers.units.Altitude; import org.droidplanner.widgets.SeekBarWithText.SeekBarWithText; @@ -9,8 +10,6 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; -import org.droidplanner.R; - public class MissionWaypointFragment extends MissionDetailFragment implements OnTextSeekBarChangedListener, OnCheckedChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/FlightModePanel.java b/DroidPlanner/src/org/droidplanner/fragments/mode/FlightModePanel.java index 50b5523010..a5159bb58e 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/FlightModePanel.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/FlightModePanel.java @@ -1,21 +1,20 @@ package org.droidplanner.fragments.mode; +import org.droidplanner.R; +import org.droidplanner.activities.helpers.SuperActivity; +import org.droidplanner.drone.Drone; +import org.droidplanner.drone.DroneInterfaces; +import org.droidplanner.drone.DroneInterfaces.OnDroneListener; + import android.app.Activity; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import com.MAVLink.Messages.ApmModes; -import org.droidplanner.R; -import org.droidplanner.activities.helpers.SuperActivity; -import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneInterfaces; -import org.droidplanner.drone.DroneInterfaces.OnDroneListener; - /** * Implements the flight/apm mode panel description. */ diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAcroFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAcroFragment.java index 71710e3141..7bb7f8996a 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAcroFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAcroFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeAcroFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAltholdFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAltholdFragment.java index 676714491c..2f2ba79773 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAltholdFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAltholdFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeAltholdFragment extends Fragment{ @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAutoFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAutoFragment.java index 8d8007e78e..61f661797b 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAutoFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeAutoFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; +import org.droidplanner.R; + import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeAutoFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeCircleFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeCircleFragment.java index 8e1fb41272..e0a54d4d78 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeCircleFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeCircleFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeCircleFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDisconnectedFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDisconnectedFragment.java index a04efba6f4..884b0b0a0e 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDisconnectedFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDisconnectedFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeDisconnectedFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDriftFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDriftFragment.java index 1de81a738a..7d59a6a674 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDriftFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeDriftFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeDriftFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeGuidedFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeGuidedFragment.java index fdf332c036..79a9082bdf 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeGuidedFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeGuidedFragment.java @@ -1,10 +1,11 @@ package org.droidplanner.fragments.mode; import org.droidplanner.DroidPlannerApp; +import org.droidplanner.R; import org.droidplanner.drone.Drone; -import android.support.v4.app.Fragment; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -12,8 +13,6 @@ import android.widget.Button; import android.widget.TextView; -import org.droidplanner.R; - public class ModeGuidedFragment extends Fragment implements OnClickListener { diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLandFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLandFragment.java index 60efc954bd..667c689f41 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLandFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLandFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeLandFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLoiterFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLoiterFragment.java index 5aa716dfa4..bdc6c1c3c0 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLoiterFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeLoiterFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeLoiterFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeOFLoiterFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeOFLoiterFragment.java index c0655e396d..cdb8701e92 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeOFLoiterFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeOFLoiterFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; +import org.droidplanner.R; + import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeOFLoiterFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModePositionFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModePositionFragment.java index 05302c161a..e2744e81a0 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModePositionFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModePositionFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModePositionFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeRTLFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeRTLFragment.java index bbef097909..f653c895bb 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeRTLFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeRTLFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; +import org.droidplanner.R; + import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeRTLFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeSportFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeSportFragment.java index bd18a5ad71..a7890e3a3d 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeSportFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeSportFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; +import org.droidplanner.R; + import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeSportFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeStabilizeFragment.java b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeStabilizeFragment.java index 5fc6f49f37..99016eb617 100644 --- a/DroidPlanner/src/org/droidplanner/fragments/mode/ModeStabilizeFragment.java +++ b/DroidPlanner/src/org/droidplanner/fragments/mode/ModeStabilizeFragment.java @@ -1,13 +1,13 @@ package org.droidplanner.fragments.mode; -import android.support.v4.app.Fragment; +import org.droidplanner.R; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import org.droidplanner.R; - public class ModeStabilizeFragment extends Fragment { @Override diff --git a/DroidPlanner/src/org/droidplanner/helpers/LocalMapTileProvider.java b/DroidPlanner/src/org/droidplanner/helpers/LocalMapTileProvider.java index e4af1207bd..6f7705d016 100644 --- a/DroidPlanner/src/org/droidplanner/helpers/LocalMapTileProvider.java +++ b/DroidPlanner/src/org/droidplanner/helpers/LocalMapTileProvider.java @@ -9,8 +9,6 @@ import org.droidplanner.file.DirectoryPath; import org.droidplanner.file.FileStream; -import android.util.Log; - import com.google.android.gms.maps.model.Tile; import com.google.android.gms.maps.model.TileProvider; diff --git a/DroidPlanner/src/org/droidplanner/helpers/RecordMe.java b/DroidPlanner/src/org/droidplanner/helpers/RecordMe.java index 5e39c6899e..63e42332d4 100644 --- a/DroidPlanner/src/org/droidplanner/helpers/RecordMe.java +++ b/DroidPlanner/src/org/droidplanner/helpers/RecordMe.java @@ -1,7 +1,6 @@ package org.droidplanner.helpers; import org.droidplanner.drone.Drone; -import org.droidplanner.drone.DroneInterfaces.DroneEventsType; import android.content.Context; import android.location.Location; diff --git a/DroidPlanner/src/org/droidplanner/parameters/ParameterMetadata.java b/DroidPlanner/src/org/droidplanner/parameters/ParameterMetadata.java index 275d5050d8..f40f1ee043 100644 --- a/DroidPlanner/src/org/droidplanner/parameters/ParameterMetadata.java +++ b/DroidPlanner/src/org/droidplanner/parameters/ParameterMetadata.java @@ -3,7 +3,6 @@ import java.io.Serializable; import java.text.DecimalFormat; import java.text.ParseException; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/DroidPlanner/src/org/droidplanner/polygon/Polygon.java b/DroidPlanner/src/org/droidplanner/polygon/Polygon.java index da52495db0..2456607a83 100644 --- a/DroidPlanner/src/org/droidplanner/polygon/Polygon.java +++ b/DroidPlanner/src/org/droidplanner/polygon/Polygon.java @@ -3,13 +3,14 @@ import java.util.ArrayList; import java.util.List; +import org.droidplanner.R; import org.droidplanner.fragments.helpers.MapPath.PathSource; import org.droidplanner.helpers.geoTools.GeoTools; import org.droidplanner.helpers.geoTools.LineLatLng; import org.droidplanner.helpers.units.Area; import android.content.Context; -import org.droidplanner.R; + import com.google.android.gms.maps.model.LatLng; public class Polygon implements PathSource { diff --git a/DroidPlanner/src/org/droidplanner/polygon/PolygonPoint.java b/DroidPlanner/src/org/droidplanner/polygon/PolygonPoint.java index 427f1a131a..90233e0172 100644 --- a/DroidPlanner/src/org/droidplanner/polygon/PolygonPoint.java +++ b/DroidPlanner/src/org/droidplanner/polygon/PolygonPoint.java @@ -1,7 +1,7 @@ package org.droidplanner.polygon; -import org.droidplanner.fragments.markers.PolygonMarker; import org.droidplanner.fragments.markers.MarkerManager.MarkerSource; +import org.droidplanner.fragments.markers.PolygonMarker; import android.content.Context; diff --git a/DroidPlanner/src/org/droidplanner/service/MAVLinkService.java b/DroidPlanner/src/org/droidplanner/service/MAVLinkService.java index 568b034682..b2f690ed74 100644 --- a/DroidPlanner/src/org/droidplanner/service/MAVLinkService.java +++ b/DroidPlanner/src/org/droidplanner/service/MAVLinkService.java @@ -1,12 +1,11 @@ package org.droidplanner.service; +import org.droidplanner.R; import org.droidplanner.activities.FlightActivity; -import org.droidplanner.connection.BluetoothConnection; import org.droidplanner.connection.MAVLinkConnection; -import org.droidplanner.connection.TcpConnection; -import org.droidplanner.connection.UdpConnection; -import org.droidplanner.connection.UsbConnection; import org.droidplanner.connection.MAVLinkConnection.MavLinkConnectionListener; +import org.droidplanner.utils.Constants; +import org.droidplanner.utils.Utils; import android.annotation.SuppressLint; import android.app.NotificationManager; @@ -26,11 +25,9 @@ import android.support.v4.app.NotificationCompat; import android.util.Log; import android.widget.Toast; + import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPacket; -import org.droidplanner.R; -import org.droidplanner.utils.Constants; -import org.droidplanner.utils.Utils; /** * http://developer.android.com/guide/components/bound-services.html#Messenger diff --git a/DroidPlanner/src/org/droidplanner/utils/Constants.java b/DroidPlanner/src/org/droidplanner/utils/Constants.java index ce1a34b00e..97aa0eb055 100644 --- a/DroidPlanner/src/org/droidplanner/utils/Constants.java +++ b/DroidPlanner/src/org/droidplanner/utils/Constants.java @@ -1,6 +1,6 @@ package org.droidplanner.utils; -import static org.droidplanner.utils.Utils.ConnectionType; +import org.droidplanner.utils.Utils.ConnectionType; /** * Contains application related constants. diff --git a/DroidPlanner/src/org/droidplanner/utils/Utils.java b/DroidPlanner/src/org/droidplanner/utils/Utils.java index 2397199671..d48e46c9dd 100644 --- a/DroidPlanner/src/org/droidplanner/utils/Utils.java +++ b/DroidPlanner/src/org/droidplanner/utils/Utils.java @@ -1,10 +1,6 @@ package org.droidplanner.utils; -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.preference.PreferenceManager; +import java.util.Locale; import org.droidplanner.connection.BluetoothConnection; import org.droidplanner.connection.MAVLinkConnection; @@ -12,7 +8,10 @@ import org.droidplanner.connection.UdpConnection; import org.droidplanner.connection.UsbConnection; -import java.util.Locale; +import android.content.Context; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.preference.PreferenceManager; /** * Contains application related functions. diff --git a/DroidPlanner/src/org/droidplanner/widgets/NumberFieldEdit/NumberFieldEdit.java b/DroidPlanner/src/org/droidplanner/widgets/NumberFieldEdit/NumberFieldEdit.java index d4062e8a4e..c0af1b6539 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/NumberFieldEdit/NumberFieldEdit.java +++ b/DroidPlanner/src/org/droidplanner/widgets/NumberFieldEdit/NumberFieldEdit.java @@ -1,5 +1,7 @@ package org.droidplanner.widgets.NumberFieldEdit; +import org.droidplanner.R; + import android.content.Context; import android.content.res.TypedArray; import android.os.Handler; @@ -14,8 +16,6 @@ import android.widget.LinearLayout; import android.widget.TextView; -import org.droidplanner.R; - public class NumberFieldEdit extends LinearLayout implements OnTouchListener { private TextView titleText; diff --git a/DroidPlanner/src/org/droidplanner/widgets/SeekBarWithText/SeekBarWithText.java b/DroidPlanner/src/org/droidplanner/widgets/SeekBarWithText/SeekBarWithText.java index f641d83805..1991357c78 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/SeekBarWithText/SeekBarWithText.java +++ b/DroidPlanner/src/org/droidplanner/widgets/SeekBarWithText/SeekBarWithText.java @@ -1,5 +1,7 @@ package org.droidplanner.widgets.SeekBarWithText; +import org.droidplanner.R; + import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -8,8 +10,6 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -import org.droidplanner.R; - public class SeekBarWithText extends LinearLayout implements OnSeekBarChangeListener { diff --git a/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarActionProvider.java b/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarActionProvider.java index 25d8bd07b5..8c411c0f36 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarActionProvider.java +++ b/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarActionProvider.java @@ -1,10 +1,5 @@ package org.droidplanner.widgets.actionProviders; -import android.content.Context; -import android.view.ActionProvider; -import android.view.LayoutInflater; -import android.view.View; - import org.droidplanner.R; import org.droidplanner.drone.Drone; import org.droidplanner.drone.DroneInterfaces; @@ -17,6 +12,11 @@ import org.droidplanner.widgets.actionProviders.InfoBarItem.PhoneExtraInfo; import org.droidplanner.widgets.actionProviders.InfoBarItem.SignalInfo; +import android.content.Context; +import android.view.ActionProvider; +import android.view.LayoutInflater; +import android.view.View; + /** * This implements the info bar displayed on the action bar after connection with the drone. *

diff --git a/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarItem.java b/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarItem.java index 27bf138fa5..6e281584f3 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarItem.java +++ b/DroidPlanner/src/org/droidplanner/widgets/actionProviders/InfoBarItem.java @@ -1,5 +1,12 @@ package org.droidplanner.widgets.actionProviders; +import java.util.Collections; +import java.util.List; + +import org.droidplanner.R; +import org.droidplanner.drone.Drone; +import org.droidplanner.widgets.spinners.ModeAdapter; + import android.content.Context; import android.os.Handler; import android.view.Gravity; @@ -13,13 +20,6 @@ import com.MAVLink.Messages.ApmModes; -import org.droidplanner.R; -import org.droidplanner.drone.Drone; -import org.droidplanner.widgets.spinners.ModeAdapter; - -import java.util.Collections; -import java.util.List; - /** * Set of actions supported by the info bar */ diff --git a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/MissionItemView.java b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/MissionItemView.java index 6da0519a5d..63ca54c1aa 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/MissionItemView.java +++ b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/MissionItemView.java @@ -2,6 +2,7 @@ import java.util.List; +import org.droidplanner.R; import org.droidplanner.drone.variables.mission.waypoints.SpatialCoordItem; import org.droidplanner.helpers.units.Length; @@ -13,8 +14,6 @@ import android.widget.ArrayAdapter; import android.widget.TextView; -import org.droidplanner.R; - public class MissionItemView extends ArrayAdapter { private Context context; diff --git a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java index 58e3b2b7ae..2be7ae4a17 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java +++ b/DroidPlanner/src/org/droidplanner/widgets/adapterViews/NavigationDrawerAdapter.java @@ -1,5 +1,19 @@ package org.droidplanner.widgets.adapterViews; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.droidplanner.R; +import org.droidplanner.activities.ConfigurationActivity; +import org.droidplanner.activities.DrawerNavigationUI; +import org.droidplanner.activities.EditorActivity; +import org.droidplanner.activities.FlightActivity; +import org.droidplanner.activities.SettingsActivity; +import org.droidplanner.fragments.helpers.HelpDialogFragment; + import android.content.Context; import android.content.Intent; import android.os.Handler; @@ -12,20 +26,6 @@ import android.widget.ImageView; import android.widget.TextView; -import org.droidplanner.R; -import org.droidplanner.activities.ConfigurationActivity; -import org.droidplanner.activities.DrawerNavigationUI; -import org.droidplanner.activities.EditorActivity; -import org.droidplanner.activities.FlightActivity; -import org.droidplanner.activities.SettingsActivity; -import org.droidplanner.fragments.helpers.HelpDialogFragment; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Adapter for the navigation drawer items */ diff --git a/DroidPlanner/src/org/droidplanner/widgets/button/RadioButtonCenter.java b/DroidPlanner/src/org/droidplanner/widgets/button/RadioButtonCenter.java index 2b5543cdb5..45e86ed927 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/button/RadioButtonCenter.java +++ b/DroidPlanner/src/org/droidplanner/widgets/button/RadioButtonCenter.java @@ -1,5 +1,7 @@ package org.droidplanner.widgets.button; +import org.droidplanner.R; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -7,7 +9,6 @@ import android.util.AttributeSet; import android.view.Gravity; import android.widget.RadioButton; -import org.droidplanner.R; /** * This class implements a radio button with custom gravity. The api's version is always diff --git a/DroidPlanner/src/org/droidplanner/widgets/spinners/ModeAdapter.java b/DroidPlanner/src/org/droidplanner/widgets/spinners/ModeAdapter.java index a80a42c3e2..9401626c23 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/spinners/ModeAdapter.java +++ b/DroidPlanner/src/org/droidplanner/widgets/spinners/ModeAdapter.java @@ -1,13 +1,14 @@ package org.droidplanner.widgets.spinners; +import java.util.List; + import android.content.Context; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; -import com.MAVLink.Messages.ApmModes; -import java.util.List; +import com.MAVLink.Messages.ApmModes; public class ModeAdapter extends ArrayAdapter { diff --git a/DroidPlanner/src/org/droidplanner/widgets/viewPager/TabPageIndicator.java b/DroidPlanner/src/org/droidplanner/widgets/viewPager/TabPageIndicator.java index 31709aeb4c..9c1cbeaa3a 100644 --- a/DroidPlanner/src/org/droidplanner/widgets/viewPager/TabPageIndicator.java +++ b/DroidPlanner/src/org/droidplanner/widgets/viewPager/TabPageIndicator.java @@ -16,6 +16,11 @@ */ package org.droidplanner.widgets.viewPager; +import static android.view.ViewGroup.LayoutParams.FILL_PARENT; +import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; + +import org.droidplanner.R; + import android.content.Context; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; @@ -26,10 +31,6 @@ import android.widget.HorizontalScrollView; import android.widget.LinearLayout; import android.widget.TextView; -import org.droidplanner.R; - -import static android.view.ViewGroup.LayoutParams.FILL_PARENT; -import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; /** * This widget implements the dynamic action bar tab behavior that can change diff --git a/Mavlink/src/com/MAVLink/Messages/MAVLinkPacket.java b/Mavlink/src/com/MAVLink/Messages/MAVLinkPacket.java index 0afc43be1c..b6e8726d05 100644 --- a/Mavlink/src/com/MAVLink/Messages/MAVLinkPacket.java +++ b/Mavlink/src/com/MAVLink/Messages/MAVLinkPacket.java @@ -1,7 +1,9 @@ package com.MAVLink.Messages; -import android.util.Log; import java.io.Serializable; + +import android.util.Log; + import com.MAVLink.Messages.ardupilotmega.*; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ahrs.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ahrs.java index efce7d0d6b..2ab4b3b2ef 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ahrs.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ahrs.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ap_adc.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ap_adc.java index 2779ca44ea..26eb84de23 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ap_adc.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ap_adc.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude.java index 795e022a03..a01ff9be86 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude_quaternion.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude_quaternion.java index c71058e2ac..be32872dab 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude_quaternion.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_attitude_quaternion.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_auth_key.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_auth_key.java index 0bafa156a1..1e7d67a836 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_auth_key.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_auth_key.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_battery_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_battery_status.java index 7c262e19a6..04bcef590b 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_battery_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_battery_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control.java index f1a751d37b..f29ca625ad 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control_ack.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control_ack.java index e78b6350bb..eba3f16d98 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control_ack.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_change_operator_control_ack.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_ack.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_ack.java index ce2b57ced9..75c5cf0737 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_ack.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_ack.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_long.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_long.java index f7c234aca7..1ff090767f 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_long.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_command_long.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data16.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data16.java index 69b5521c43..be921ad867 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data16.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data16.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data32.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data32.java index e005cdfcb0..8b7a418cb0 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data32.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data32.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data64.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data64.java index 8e3d0991ca..fbefb12128 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data64.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data64.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data96.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data96.java index 46afdbfa59..3511c288e5 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data96.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data96.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data_stream.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data_stream.java index 3f7180e866..738188a8cd 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data_stream.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_data_stream.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug.java index cf6cfab845..416fa60ad8 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug_vect.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug_vect.java index 00e6bbbca8..0a9c881675 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug_vect.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_debug_vect.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_configure.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_configure.java index 4b96c42293..84ffb77a87 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_configure.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_configure.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_control.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_control.java index a510632b4d..4e198efbf7 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_control.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_digicam_control.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_fetch_point.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_fetch_point.java index c74473c4f6..e89ac0b419 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_fetch_point.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_fetch_point.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_point.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_point.java index 739da238b8..1db54170ac 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_point.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_point.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_status.java index 23013f88fa..7e43922959 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_fence_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_dir_list.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_dir_list.java index 472a34f7a3..9cf0259bf8 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_dir_list.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_dir_list.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_res.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_res.java index 3c5fbea03e..9b97c272b6 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_res.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_res.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_start.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_start.java index 06931743eb..48a0780db5 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_start.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_file_transfer_start.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_int.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_int.java index 7f1a9d8550..899f858187 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_int.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_int.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_setpoint_int.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_setpoint_int.java index b9f6c02fe1..58341fedb9 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_setpoint_int.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_position_setpoint_int.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_vision_position_estimate.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_vision_position_estimate.java index 53ba85366f..21b3e5109d 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_vision_position_estimate.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_global_vision_position_estimate.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_global_origin.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_global_origin.java index 54e8df9ba8..3e2608160e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_global_origin.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_global_origin.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_raw_int.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_raw_int.java index 518a1aedc8..2aaf0c3de0 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_raw_int.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_raw_int.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_status.java index 5ca80f1b50..ee01858cf8 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_gps_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_heartbeat.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_heartbeat.java index 97d359294d..8e57e497d6 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_heartbeat.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_heartbeat.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_highres_imu.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_highres_imu.java index 8b135a2c09..6cc7a814e0 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_highres_imu.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_highres_imu.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_controls.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_controls.java index cd20b0f642..c732211934 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_controls.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_controls.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_rc_inputs_raw.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_rc_inputs_raw.java index 66005df9e3..04d1a4dbcb 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_rc_inputs_raw.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_rc_inputs_raw.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_state.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_state.java index 5db2a22457..4f157f42a6 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_state.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hil_state.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hwstatus.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hwstatus.java index 538f5dc26d..f801f34c5d 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hwstatus.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_hwstatus.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_limits_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_limits_status.java index 8876531776..92ec490248 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_limits_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_limits_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned.java index cbd43e0b96..60ae6bd4a5 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned_system_global_offset.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned_system_global_offset.java index 540985e754..7672ed58a7 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned_system_global_offset.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_ned_system_global_offset.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_setpoint.java index 9becf489dd..5f3ed68929 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_local_position_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_control.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_control.java index fb290783a2..6da11d3851 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_control.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_control.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_setpoint.java index df8570e366..2e6a9a6cdc 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_manual_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_meminfo.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_meminfo.java index 29abb966d6..6faba93082 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_meminfo.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_meminfo.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_memory_vect.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_memory_vect.java index 955152108c..493ecfa63b 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_memory_vect.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_memory_vect.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_ack.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_ack.java index 19a8118a2b..9046dc0318 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_ack.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_ack.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_clear_all.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_clear_all.java index 2f4f2bccd9..9065ff1812 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_clear_all.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_clear_all.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_count.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_count.java index 57114c7aee..d6b09b65ac 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_count.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_count.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_current.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_current.java index bf3ab6f357..08c7434887 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_current.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_current.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item.java index fd9c108ff9..c3c346973a 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item_reached.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item_reached.java index a8e4fb1a87..bea00e3b8c 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item_reached.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_item_reached.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request.java index 4ee09b4e49..1e3eb09b51 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_list.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_list.java index 3e9b0e91d7..9a067b5f33 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_list.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_list.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_partial_list.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_partial_list.java index 4823031945..649f52156d 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_partial_list.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_request_partial_list.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_set_current.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_set_current.java index e0e86086f4..d338de1dc3 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_set_current.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_set_current.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_write_partial_list.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_write_partial_list.java index 1acde17086..ddf83359f7 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_write_partial_list.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mission_write_partial_list.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_configure.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_configure.java index e1a4e4b864..6ffb8096cf 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_configure.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_configure.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_control.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_control.java index e2cbe5e7c6..6841917a39 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_control.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_control.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_status.java index 902a11307c..64c5bd1c98 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_mount_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_float.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_float.java index d061091594..3f56b0672c 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_float.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_float.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_int.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_int.java index 347fdababe..ad2965f942 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_int.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_named_value_int.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_nav_controller_output.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_nav_controller_output.java index e4b3db094e..70797ad0c3 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_nav_controller_output.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_nav_controller_output.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_optical_flow.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_optical_flow.java index 352896669e..442d79eb83 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_optical_flow.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_optical_flow.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_list.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_list.java index 0e1c85e7b5..e6bc837ee0 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_list.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_list.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_read.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_read.java index b7423fc34d..b75e9903eb 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_read.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_request_read.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_set.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_set.java index 331fad9a98..09619b11d4 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_set.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_set.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_value.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_value.java index 9920a77502..03816cc22a 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_value.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_param_value.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ping.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ping.java index bce9f3f31c..adbd044d4e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ping.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_ping.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_radio.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_radio.java index 0f4fe3b110..af1038625a 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_radio.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_radio.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_imu.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_imu.java index 00f08788a4..6001aaca38 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_imu.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_imu.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_pressure.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_pressure.java index a917bdd9ea..ab62f7f8b8 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_pressure.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_raw_pressure.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_override.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_override.java index 10fa0cb2eb..db3bb73c21 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_override.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_override.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_raw.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_raw.java index 01fbb7febd..ad06868e32 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_raw.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_raw.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_scaled.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_scaled.java index bcd1fcbb30..8b90999ac2 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_scaled.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_rc_channels_scaled.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_request_data_stream.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_request_data_stream.java index 5764a3aff6..ee470392c1 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_request_data_stream.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_request_data_stream.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_rates_thrust_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_rates_thrust_setpoint.java index cbb611b2bd..d07f51b27a 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_rates_thrust_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_rates_thrust_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_speed_thrust_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_speed_thrust_setpoint.java index 6813a91d75..c82874bf6b 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_speed_thrust_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_speed_thrust_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_thrust_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_thrust_setpoint.java index 2833618669..42727c2289 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_thrust_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_roll_pitch_yaw_thrust_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_allowed_area.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_allowed_area.java index 6b1e4414d6..068cefe249 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_allowed_area.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_allowed_area.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_set_allowed_area.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_set_allowed_area.java index 25ae37061d..dc0196451e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_set_allowed_area.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_safety_set_allowed_area.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_imu.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_imu.java index 810d28522a..bae719c77e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_imu.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_imu.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_pressure.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_pressure.java index 041c7e050e..424fae14e2 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_pressure.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_scaled_pressure.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sensor_offsets.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sensor_offsets.java index bfcc41bedb..6805be8696 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sensor_offsets.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sensor_offsets.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_servo_output_raw.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_servo_output_raw.java index 5dac9d58cc..007421bf16 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_servo_output_raw.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_servo_output_raw.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_global_position_setpoint_int.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_global_position_setpoint_int.java index 76a38a8a1b..cd8b03c87d 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_global_position_setpoint_int.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_global_position_setpoint_int.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_gps_global_origin.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_gps_global_origin.java index 7cd3a3881f..13613642db 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_gps_global_origin.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_gps_global_origin.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_local_position_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_local_position_setpoint.java index b07d75477a..5166cc7d0f 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_local_position_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_local_position_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mag_offsets.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mag_offsets.java index c9c5c3e7fc..4e4ec361e7 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mag_offsets.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mag_offsets.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mode.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mode.java index 249cb05103..bbfb32d1f9 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mode.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_mode.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_motors_setpoint.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_motors_setpoint.java index 99ec34cf4d..c4fdea68a4 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_motors_setpoint.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_motors_setpoint.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_led_roll_pitch_yaw_thrust.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_led_roll_pitch_yaw_thrust.java index 3639f24484..db14a9e2a1 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_led_roll_pitch_yaw_thrust.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_led_roll_pitch_yaw_thrust.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_roll_pitch_yaw_thrust.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_roll_pitch_yaw_thrust.java index 10f7011a12..2ddd24d746 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_roll_pitch_yaw_thrust.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_quad_swarm_roll_pitch_yaw_thrust.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_speed_thrust.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_speed_thrust.java index b4a5a43299..5bcf84b4ab 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_speed_thrust.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_speed_thrust.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_thrust.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_thrust.java index 12a221bfd3..ec5dfd0d83 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_thrust.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_set_roll_pitch_yaw_thrust.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_6dof.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_6dof.java index 1687675c04..7f4034c06f 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_6dof.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_6dof.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_8dof.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_8dof.java index 1ec715a62a..75849eec50 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_8dof.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_setpoint_8dof.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_simstate.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_simstate.java index b343eb441d..3113ca333f 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_simstate.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_simstate.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_state_correction.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_state_correction.java index 67d8d8caa0..296ccc338e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_state_correction.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_state_correction.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_statustext.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_statustext.java index 7b12c3f85f..9922384cd3 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_statustext.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_statustext.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sys_status.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sys_status.java index 0f9c0c1090..fc88126879 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sys_status.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_sys_status.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_system_time.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_system_time.java index c2f4364ca4..7efe4de6a1 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_system_time.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_system_time.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vfr_hud.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vfr_hud.java index c13ba89917..878923c971 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vfr_hud.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vfr_hud.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vicon_position_estimate.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vicon_position_estimate.java index 3d0ca4c618..a7b7afde3e 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vicon_position_estimate.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vicon_position_estimate.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_position_estimate.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_position_estimate.java index 0fb2872465..f1b691424b 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_position_estimate.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_position_estimate.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_speed_estimate.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_speed_estimate.java index f6b9710fa7..6ef51bdb66 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_speed_estimate.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_vision_speed_estimate.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** diff --git a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_wind.java b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_wind.java index 9744c6bc26..6da6883579 100644 --- a/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_wind.java +++ b/Mavlink/src/com/MAVLink/Messages/ardupilotmega/msg_wind.java @@ -2,8 +2,8 @@ package com.MAVLink.Messages.ardupilotmega; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkPacket; +import com.MAVLink.Messages.MAVLinkPayload; //import android.util.Log; /** From b210cb2a3786299944ce09d13741a953f2670fc1 Mon Sep 17 00:00:00 2001 From: Arthur Benemann Date: Thu, 27 Feb 2014 14:19:23 -0300 Subject: [PATCH 7/7] Version: Releasing version 2.2.2 --- ChangeLog.md | 4 ++++ DroidPlanner/AndroidManifest.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index bea11579cd..ce22b9d984 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -8,6 +8,10 @@ Our convention for release control is the following (for a release like DPvA.B.C All the changes are logged below (preferable with the pull request numbers in parenteses): # Releases +## Droidplanner v2.2.2 +* Implemented the Android Navigation Drawer (#653) +* Renamed the HUD to Attitude Indicator (#651) + ## Droidplanner v2.2.1 * Fix errors in Land, Takeoff and RTH mission items (#655) * German Translation and Language Selector in settings (#650) diff --git a/DroidPlanner/AndroidManifest.xml b/DroidPlanner/AndroidManifest.xml index 8969e35e77..966bc26544 100644 --- a/DroidPlanner/AndroidManifest.xml +++ b/DroidPlanner/AndroidManifest.xml @@ -1,7 +1,7 @@