Merge pull request #100 from googlesamples/release-ikariotikos

Release ikariotikos

README.md

@@ -45,6 +45,9 @@ example code can focus on the Tango-specific aspects of the application.
    to stay affixed in space.
  * **java_floor_plan_example** - Create a floor plan by
    using the depth sensor to detect and mesure walls in a room.
+ * **java_marker_detection_example** - Build an augmented reality appliction
+   to detect AR markers in real world, and to render the boundaries and poses of
+   markers.
  * **java_model_correspondence_example** - Create a mapping
    between a virtual 3D object and selected points in the real world.
  * **java_motion_tracking_example** - Use Tango motion

java_augmented_reality_example/app/src/main/java/com/projecttango/examples/java/augmentedreality/AugmentedRealityActivity.java

@@ -182,10 +182,10 @@ public void run() {
                 // OpenGL thread or in the UI thread.
                 synchronized (AugmentedRealityActivity.this) {
                     try {
-                        TangoSupport.initialize();
                         mConfig = setupTangoConfig(mTango);
                         mTango.connect(mConfig);
                         startupTango();
+                        TangoSupport.initialize(mTango);
                         mIsConnected = true;
                         setDisplayRotation();
                     } catch (TangoOutOfDateException e) {

java_basic_examples/hello_motion_tracking/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
             android:required="true" />
         <activity android:name=".HelloMotionTrackingActivity"
             android:label="@string/app_name_long"
+            android:configChanges="orientation|screenSize"
             android:screenOrientation="fullSensor">
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.MAIN" />

java_basic_examples/hello_video/src/main/java/com/projecttango/examples/java/hellovideo/HelloVideoActivity.java

@@ -129,10 +129,10 @@ public void run() {
                 // the OpenGL thread or in the UI thread.
                 synchronized (HelloVideoActivity.this) {
                     try {
-                        TangoSupport.initialize();
                         mConfig = setupTangoConfig(mTango);
                         mTango.connect(mConfig);
                         startupTango();
+                        TangoSupport.initialize(mTango);
                         mIsConnected = true;
                         setDisplayRotation();
                     } catch (TangoOutOfDateException e) {

java_floor_plan_reconstruction_example/app/src/main/java/com/projecttango/examples/java/floorplanreconstruction/FloorPlanReconstructionActivity.java

@@ -170,10 +170,10 @@ private void bindTangoService() {
             public void run() {
                 synchronized (FloorPlanReconstructionActivity.this) {
                     try {
-                        TangoSupport.initialize();
                         mConfig = setupTangoConfig(mTango);
                         mTango.connect(mConfig);
                         startupTango();
+                        TangoSupport.initialize(mTango);
                         mIsConnected = true;
                         mIsPaused = false;
                         runOnUiThread(new Runnable() {

java_green_screen_example/app/src/main/java/com/projecttango/examples/java/greenscreen/GreenScreenActivity.java

@@ -210,10 +210,10 @@ private void bindTangoService() {
             public void run() {
                 synchronized (GreenScreenActivity.this) {
                     try {
-                        TangoSupport.initialize();
                         mConfig = setupTangoConfig(mTango);
                         mTango.connect(mConfig);
                         startupTango();
+                        TangoSupport.initialize(mTango);
                         mIsConnected = true;
                         setDisplayRotation();
                     } catch (TangoOutOfDateException e) {

java_marker_detection_example/.gitignore

@@ -0,0 +1,7 @@
+.gradle
+local.properties
+.idea
+*.iml
+.DS_Store
+build
+captures

java_marker_detection_example/README.md

@@ -0,0 +1,14 @@
+API example that demonstrates marker detection API.
+
+Please follow the instructions below to run the example:
+ 1. Build and install the app onto your device.
+ 2. Print one or a few markers from the attached ar_markers.pdf file. Please
+    print the marker on a Letter size paper, without using any zooming or scaling
+    factor. Please measure every side of the marker using a ruler to make sure
+    it is 14cm.
+ 3. Place the printed marker(s) on a flat surface, tables or walls.
+ 4. Run the example app from your device, and point the device camera to the
+    printed markers.
+ 5. For every marker detected, the boundary and the axes of the local frame will
+    be displayed. For the X, Y and Z axes of the local frame, RED, GREEN and
+    BLUE lines will be displayed.

java_marker_detection_example/app/.gitignore

@@ -0,0 +1 @@
+/build

java_marker_detection_example/app/build.gradle

@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.projecttango.experiments.markerdetectionsample"
+        minSdkVersion 19
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+
+        lintOptions {
+            abortOnError false
+        }
+    }
+}
+
+
+dependencies {
+    apply from: '../../version.gradle'
+    compile "com.google.tango:sdk-base:${release_version}"
+    compile "com.google.tango:support-base:${release_version}"
+    compile "org.rajawali3d:rajawali:1.1.668@aar"
+    compile "com.android.support:appcompat-v7:23.0.0"
+}

java_marker_detection_example/app/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /opt/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

java_marker_detection_example/app/src/main/AndroidManifest.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright 2017 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.projecttango.examples.java.markerdetection"
+    android:versionCode="0"
+    android:versionName="0" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="23" />
+
+     <uses-permission android:name="android.permission.CAMERA" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <uses-library
+            android:name="com.projecttango.libtango_device2"
+            android:required="true" />
+        <activity
+            android:name=".MarkerDetectionActivity"
+            android:label="@string/app_name_long"
+            android:configChanges="orientation|screenSize">
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>