Merge branch 'master' into beta

Conflicts: Android/AndroidManifest.xml Android/res/layout/activity_drawer_navigation_ui.xml Android/res/layout/fragment_mode_circle.xml
DroidPlanner · Oct 22, 2014 · 25e3243 · 25e3243
2 parents 6d568e8 + 5e7734c
commit 25e3243
Show file tree

Hide file tree

Showing 434 changed files with 53,583 additions and 6,137 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,9 @@ proguard/
 #Android Studio files
 *.iml
 .idea/
+
+# Eclipse files
+.metadata
+
+# Mac OSX files
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,8 @@ android:
 
 before_script:
     - echo yes | android update sdk -u -a -t tools
-    - echo yes | android update sdk -u -a -t build-tools-20.0.0,build-tools-19.1.0
-    - echo yes | android update sdk -u -a -t android-20,android-19
+    - echo yes | android update sdk -u -a -t build-tools-21.0.1,build-tools-20.0.0,build-tools-19.1.0
+    - echo yes | android update sdk -u -a -t android-21,android-20,android-19
     - echo yes | android update sdk -u -a -t extra-google-m2repository
     - echo yes | android update sdk -u -a -t extra-android-m2repository
     - echo yes | android update sdk -u -a -t extra-android-support,extra-google-google_play_services

diff --git a/Android/.classpath b/Android/.classpath
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="src" path="/Core"/>
-	<classpathentry exported="true" kind="src" path="/Mavlink"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="104"
+          android:versionCode="105"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <supports-screens
         android:requiresSmallestWidthDp="320"/>
@@ -134,6 +134,12 @@
                 android:value=".android.activities.SettingsActivity"/>
         </activity>
 
+        <activity
+                    android:name=".android.activities.LocatorActivity"
+                    android:label="@string/locator"
+                    android:launchMode="singleTop"
+                    android:theme="@style/CustomActionBarTheme.Transparent"          />
+
         <receiver android:name=".android.communication.service.NetworkConnectivityReceiver"
             android:enabled="false">
             <intent-filter>

diff --git a/Android/assets/CameraInfo/GoPro Hero 4 Black.xml b/Android/assets/CameraInfo/GoPro Hero 4 Black.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cameraInfo>
+    <Name>GoPro Hero 4 Black</Name>
+    <SensorWidth>6.17</SensorWidth>
+    <SensorHeight>4.55</SensorHeight>
+    <SensorResolution>12.0</SensorResolution>
+    <FocalLength>14</FocalLength>
+</cameraInfo>
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -5,7 +5,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:20.0.0'
     compile files('libs/droneapi-java.jar')
     compile 'com.google.android.gms:play-services:5.0.89'
     compile 'com.sothree.slidinguppanel:library:2.0.2'
@@ -17,25 +16,29 @@ dependencies {
         transitive=true
     }
 
+    compile 'com.android.support:support-v4:20.0.0'
+
+    compile project(':Core')
+    compile project(':Mavlink')
+    compile project(':Libraries:HorizontalVariableListView:HorizontalVariableListView')
+
     compile files('libs/usbseriallibrary.jar')
     compile files('libs/j2xx.jar')
     compile files('libs/protobuf-java-2.5.0.jar')
     compile files('libs/jeromq-0.3.4.jar')
 
-    compile project(':Core')
-    compile project(':Mavlink')
-    compile project(':Libraries:HorizontalVariableListView:HorizontalVariableListView')
     compile project(':Libraries:PebbleKit')
     compile project(':Libraries:usb-serial-for-android:UsbSerialLibrary')
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 21
+    buildToolsVersion "21.0.1"
 
     defaultConfig {
+        applicationId 'org.droidplanner'
         minSdkVersion 14
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionName getGitVersion()
     }
 

diff --git a/Android/libs/droneapi-java.jar b/Android/libs/droneapi-java.jar
diff --git a/Android/project.properties b/Android/project.properties
@@ -11,12 +11,13 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-21
 android.library.reference.1=../Libraries/usb-serial-for-android/UsbSerialLibrary
 android.library.reference.2=../Libraries/HorizontalVariableListView/HorizontalVariableListView
-android.library.reference.3=../Mavlink
-android.library.reference.4=../Core
-android.library.reference.5=../Libraries/google-play-services_lib
-android.library.reference.6=../Libraries/PebbleKit
-android.library.reference.7=../Libraries/mapbox-android-sdk/0.4.0
-android.library.reference.8=../Libraries/AndroidSlidingUpPanel-2.0.2/library
+android.library.reference.3=../Libraries/google-play-services_lib
+android.library.reference.4=../Libraries/PebbleKit
+android.library.reference.5=../Libraries/mapbox-android-sdk/0.4.0
+android.library.reference.6=../Libraries/AndroidSlidingUpPanel-2.0.2/library
+android.library.reference.7=../Libraries/EllipsoidFit/EllipsoidFit
+android.library.reference.8=../Mavlink
+android.library.reference.9=../Core
diff --git a/Android/res/drawable-hdpi/.DS_Store b/Android/res/drawable-hdpi/.DS_Store
diff --git a/Android/res/drawable-hdpi/ic_action_expand.png b/Android/res/drawable-hdpi/ic_action_expand.png
diff --git a/Android/res/drawable-hdpi/ic_action_expand_blue.png b/Android/res/drawable-hdpi/ic_action_expand_blue.png
diff --git a/Android/res/drawable-mdpi/.DS_Store b/Android/res/drawable-mdpi/.DS_Store
diff --git a/Android/res/drawable-mdpi/ic_action_expand.png b/Android/res/drawable-mdpi/ic_action_expand.png
diff --git a/Android/res/drawable-mdpi/ic_action_expand_blue.png b/Android/res/drawable-mdpi/ic_action_expand_blue.png
diff --git a/Android/res/drawable-mdpi/ic_locator_time.png b/Android/res/drawable-mdpi/ic_locator_time.png
diff --git a/Android/res/drawable-xhdpi/.DS_Store b/Android/res/drawable-xhdpi/.DS_Store
diff --git a/Android/res/drawable-xhdpi/ic_action_expand.png b/Android/res/drawable-xhdpi/ic_action_expand.png
diff --git a/Android/res/drawable-xhdpi/ic_action_expand_blue.png b/Android/res/drawable-xhdpi/ic_action_expand_blue.png
diff --git a/Android/res/drawable-xxhdpi/ic_action_expand.png b/Android/res/drawable-xxhdpi/ic_action_expand.png
diff --git a/Android/res/drawable-xxhdpi/ic_action_expand_blue.png b/Android/res/drawable-xxhdpi/ic_action_expand_blue.png
diff --git a/Android/res/drawable/button_green.xml → ...id/res/drawable/button_green_drawable.xml b/Android/res/drawable/button_green.xml → ...id/res/drawable/button_green_drawable.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/button_green_pressed"		android:state_pressed="true" />
+    <item android:drawable="@drawable/button_grey" android:state_enabled="false" />
     <item android:drawable="@drawable/button_green"				android:state_focused="true" />
     <item android:drawable="@drawable/button_green" />
 </selector>
diff --git a/Android/res/drawable/button_grey.xml b/Android/res/drawable/button_grey.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="2dp" />
+
+    <solid android:color="@android:color/darker_gray" />
+
+</shape>
diff --git a/Android/res/drawable/follow_me_sample.png b/Android/res/drawable/follow_me_sample.png
diff --git a/Android/res/drawable/ic_expand.xml b/Android/res/drawable/ic_expand.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/ic_action_expand_blue" />
+    <item android:drawable="@drawable/ic_action_expand" />
+</selector>
diff --git a/Android/res/drawable/ic_locator_button.xml b/Android/res/drawable/ic_locator_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_activated="true" android:drawable="@drawable/button_mission_selected" />
+    <item android:state_checked="true" android:drawable="@drawable/button_mission_selected" />
+    <item android:drawable="@drawable/button_edit" />
+</selector>
diff --git a/Android/res/layout-land/fragment_setup_imu_main.xml b/Android/res/layout-land/fragment_setup_imu_main.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:background="#151515">
+
+        <TextView
+            android:id="@+id/textViewIMUStep"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:layout_alignParentTop="true"
+            android:background="@color/ground_speed_label"
+            android:gravity="center"
+            android:text="@string/setup_imu_step"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:id="@+id/textViewIMUTimeOut"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="Time to next orientation: 30s"
+            android:padding="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:layout_below="@+id/progressBarTimeOut"
+            android:layout_marginBottom="10dp"
+            />
+
+        <ProgressBar
+            android:id="@+id/progressBarTimeOut"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="29dp"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
+            android:indeterminate="false"
+            android:max="300"
+            android:minHeight="50dp"
+            android:minWidth="300dp"
+            android:progress="150"
+            android:progressDrawable="@drawable/pstate_good"/>
+
+
+        <TextView
+            android:id="@+id/TextViewIMUOffset"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/TextViewIMUScaling"
+            android:gravity="center"
+            android:text="Offset : 00 00 00"
+            android:visibility="invisible"
+            android:textColor="#fff"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:layout_marginBottom="10dp"/>
+
+        <TextView
+            android:id="@+id/TextViewIMUScaling"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:layout_alignLeft="@+id/TextViewIMUOffset"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:text="Scaling : 00 00 00"
+            android:textColor="#fff"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:layout_marginBottom="20dp"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="2">
+
+        <TextView
+            android:id="@+id/textViewDesc"
+            style="@style/ModeDetailText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/mode_desc_rectangle"
+            android:padding="10dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/setup_imu_start"
+            android:layout_alignParentTop="true"/>
+
+        <Button
+            android:id="@+id/buttonStep"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:gravity="center"
+            android:background="@drawable/button_green_drawable"
+            android:layout_centerInParent="true"
+            style="@style/modeControl"
+            android:text="@string/button_setup_calibrate"/>
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/Android/res/layout-land/fragment_setup_mag_main.xml b/Android/res/layout-land/fragment_setup_mag_main.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:background="#151515"
+        android:layout_weight="1">
+
+        <org.droidplanner.android.widgets.scatterplot.ScatterPlot
+            android:id="@+id/scatterPlot1"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"/>
+
+        <org.droidplanner.android.widgets.scatterplot.ScatterPlot
+            android:id="@+id/scatterPlot2"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"/>
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1.75">
+
+        <TextView
+            android:id="@+id/textViewDesc"
+            style="@style/ModeDetailText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/mode_desc_rectangle"
+            android:padding="10dp"
+            android:layout_marginBottom="20dp"
+            android:text="@string/setup_imu_start"
+            />
+
+        <Button
+            android:id="@+id/buttonStep"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_gravity="center"
+            android:background="@drawable/button_green_drawable"
+            style="@style/modeControl"
+            android:text="@string/button_setup_calibrate"/>
+
+        <RelativeLayout
+            android:id="@+id/in_progress_calibration_container"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:gravity="center">
+
+            <ProgressBar
+                android:id="@+id/calibration_progress_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@android:style/Widget.Holo.ProgressBar.Horizontal"
+                android:layout_toLeftOf="@+id/calibration_progress"
+                android:layout_toStartOf="@+id/calibration_progress"
+                android:layout_above="@+id/buttonCancel"
+                android:layout_marginBottom="15dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:padding="20dp"/>
+
+            <TextView
+                android:id="@+id/calibration_progress"
+                android:layout_width="wrap_content"
+                android:minWidth="50dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="10dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_alignTop="@+id/calibration_progress_bar"
+                android:layout_alignBottom="@+id/calibration_progress_bar"
+                />
+
+            <Button
+                android:id="@+id/buttonCancel"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:background="@drawable/button_green_drawable"
+                style="@style/modeControl"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginBottom="20dp"
+                android:text="@string/button_setup_cancel"/>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/Android/res/layout-land/fragment_setup_panel_send.xml b/Android/res/layout-land/fragment_setup_panel_send.xml
@@ -34,7 +34,7 @@
             android:id="@+id/buttonSend"
             style="@style/modeControl"
             android:layout_height="wrap_content"
-            android:background="@drawable/button_green"
+            android:background="@drawable/button_green_drawable"
             android:text="@string/button_setup_send"/>
     </LinearLayout>