Merge pull request #45 from googlesamples/release-yamabe

release-yamabe
googlearchive · Oct 15, 2015 · f89352e · f89352e
2 parents 7f7d9b2 + 90bc469
commit f89352e
Show file tree

Hide file tree

Showing 73 changed files with 3,221 additions and 972 deletions.
diff --git a/AreaLearningJava/app/build.gradle b/AreaLearningJava/app/build.gradle
@@ -36,8 +36,8 @@ if (project.hasProperty("Tango.catkin_devel_prefix")) {
 }
 
 dependencies {
-    compile fileTree(dir: external_lib_prefix + '/jar', include: ['**/*.jar'])
     compile(name: 'TangoUtils', ext: 'aar')
+    compile 'org.rajawali3d:rajawali:1.0.294-SNAPSHOT@aar'
 }
 
 repositories{

diff --git a/AreaLearningJava/app/src/main/AndroidManifest.xml b/AreaLearningJava/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         <activity
             android:name="com.projecttango.experiments.javaarealearning.ALStartActivity"
             android:label="@string/menu_name"
-            android:screenOrientation="landscape" >
+            android:screenOrientation="nosensor" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -46,12 +46,12 @@
        <activity
             android:name="com.projecttango.experiments.javaarealearning.AreaLearningActivity"
             android:label="@string/app_name" 
-            android:screenOrientation="landscape">
+            android:screenOrientation="nosensor">
         </activity>
          <activity
             android:name="com.projecttango.experiments.javaarealearning.ADFUUIDListViewActivity"
             android:label="@string/app_name" 
-            android:screenOrientation="landscape">
+            android:screenOrientation="nosensor">
         </activity>
     </application>
 

diff --git a/...ngJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ADFDataSource.java b/...ngJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ADFDataSource.java
@@ -24,7 +24,6 @@
 import android.widget.Toast;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This class interfaces a Tango Object and maintains a full list of ADF UUIds. Whenever an adf is

diff --git a/.../src/main/java/com/projecttango/experiments/javaarealearning/ADFUUIDListViewActivity.java b/.../src/main/java/com/projecttango/experiments/javaarealearning/ADFUUIDListViewActivity.java
@@ -40,6 +40,7 @@
 import java.io.File;
 import java.util.Arrays;
 
+
 /**
  * This class lets you manage ADFs between this class's Application Package folder and API private
  * space. This show cases mainly three things: Import, Export, Delete an ADF file from API private
@@ -241,13 +242,12 @@ public void onAdfNameOk(String name, String uuid) {
         mUUIDListView.setAdapter(mADFAdapter);
     }
 
-
     /**
      * Implements SetADFNameDialog.CallbackListener.
      */
     @Override
     public void onAdfNameCancelled() {
-    // Nothing to do here.
+        // Nothing to do here.
     }
 }
 

diff --git a/...rningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ALRenderer.java b/...rningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ALRenderer.java