Merge remote-tracking branch 'remotes/origin/release/0.2.0'

README.md

@@ -16,6 +16,36 @@ use to represent information on the globe or in space.
 - [World Wind Forum](http://forum.worldwindcentral.com) provides help from the World Wind community
 - [Android Studio](http://developer.android.com/sdk/) is used for World Wind Android development
 
+# Release 0.2.0, May 13, 2016
+
+World Wind Android v0.2.0 adds support for screen placemarks and navigation events. The World Wind Android v0.2.0
+examples demonstrate support for MIL-STD-2525C tactical icons by using NASA World Wind's point placemark to display
+images generated by the US Army Mission Command's [MIL-STD-2525 symbol rendering library](https://github.com/missioncommand/mil-sym-android).
+
+This release establishes World Wind support for threaded rendering. Applications are now able to access World Wind
+components from the Activity thread without any synchronization, while World Wind executes OpenGL commands on Android's
+OpenGL rendering thread.
+
+- [World Wind Examples 0.2.0](http://worldwindserver.net/android/0.2.0/worldwind-examples.apk) - Example App for 0.2.0; runs on Android 4.4 and newer
+- [World Wind Library 0.2.0](http://worldwindserver.net/android/0.2.0/worldwind.aar) - Android Archive (AAR) for 0.2.0
+- [API Docs 0.2.0](http://worldwindserver.net/android/0.2.0/doc) - Developer documentation for 0.2.0
+- [JIRA 0.2.0](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA/fixforversion/10912) - Detailed release notes for 0.2.0
+
+#### Release Notes
+
+###### Requirement
+- [WWA-4](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-4) - Navigation Events
+- [WWA-11](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-11) - Screen placemark
+- [WWA-33](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-33) - MIL-STD-2525 support
+
+###### Task
+- [WWA-68](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-68) - Bitmap image source
+- [WWA-71](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-71) - Threaded rendering
+- [WWA-72](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-72) - Performance metrics
+
+###### Bug
+- [WWA-70](http://issues.worldwind.arc.nasa.gov/jira/browse/WWA-70) - WMS layer makes requests outside layer bounds
+
 # Release 0.1.0, March 30, 2016
 
 World Wind Android's initial prototype release. This release establishes the baseline for World Wind Android

mil-sym-android/build.gradle

@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2016 United States Government as represented by the Administrator of the
+ * National Aeronautics and Space Administration. All Rights Reserved.
+ */
+
+configurations.create("default")
+artifacts.add("default", file('renderer.aar'))

mil-sym-android/mil-sym-android.iml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":mil-sym-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="WorldWindAndroid" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":mil-sym-android" />
+      </configuration>
+    </facet>
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

settings.gradle

@@ -1 +1 @@
-include ':worldwind', ':worldwind-examples'
+include ':mil-sym-android', ':worldwind', ':worldwind-examples'

worldwind-examples/build.gradle

@@ -7,20 +7,23 @@ android {
         applicationId 'gov.nasa.worldwindx.examples'
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 10
-        versionName '0.1.0'
+        versionCode 20
+        versionName '0.2.0'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':worldwind')
+    compile project(':mil-sym-android')
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.2.0'
     compile 'com.android.support:design:23.2.0'

worldwind-examples/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/nasa_logo"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -22,6 +22,18 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".BasicPerformanceBenchmarkActivity"
+            android:label="@string/title_basic_performance_benchmark"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".BasicStressTestActivity"
+            android:label="@string/title_basic_stress_test"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".CameraControlActivity"
             android:label="@string/title_camera_controls"
@@ -46,6 +58,36 @@
             android:launchMode="singleInstance"
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
+        <activity
+            android:name=".NavigatorEventActivity"
+            android:label="@string/title_navigator_event"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".PlacemarksActivity"
+            android:label="@string/title_placemarks"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".PlacemarksMilStd2525Activity"
+            android:label="@string/title_placemarks_milstd2525"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".PlacemarksMilStd2525StressActivity"
+            android:label="@string/title_placemarks_milstd2525_stress_test"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".PlacemarksStressTestActivity"
+            android:label="@string/title_placemarks_stress_test"
+            android:launchMode="singleInstance"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".ShowTessellationActivity"
             android:label="@string/title_show_tessellation"