Skip to content
This repository was archived by the owner on Mar 2, 2018. It is now read-only.

Commit 8af76b2

Browse files
committed
release-yamabe
1 parent 7f7d9b2 commit 8af76b2

83 files changed

Lines changed: 3392 additions & 623 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AreaLearningJava/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
cmake_minimum_required(VERSION 2.8)
2+
project(area_learning_java)
3+
4+
find_package(redwood_catkin REQUIRED)
5+
redwood_build_only_if(ANDROID)
6+
7+
catkin_simple()
8+
9+
# This macro will also generate a depends.inc file with useful source and
10+
# dependency information to pass on to ndk-build.
11+
build_gradle_apk(JavaAreaLearning
12+
TRACK # Files to track, trigger rebuilds when changed.
13+
${SRC_FILES}
14+
app/src/main/AndroidManifest.xml
15+
JNI_DIRECTORY app/src/main/jni
16+
)

AreaLearningJava/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if (project.hasProperty("Tango.catkin_devel_prefix")) {
3838
dependencies {
3939
compile fileTree(dir: external_lib_prefix + '/jar', include: ['**/*.jar'])
4040
compile(name: 'TangoUtils', ext: 'aar')
41+
compile 'org.rajawali3d:rajawali:1.0.294-SNAPSHOT@aar'
4142
}
4243

4344
repositories{

AreaLearningJava/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<activity
3737
android:name="com.projecttango.experiments.javaarealearning.ALStartActivity"
3838
android:label="@string/menu_name"
39-
android:screenOrientation="landscape" >
39+
android:screenOrientation="nosensor" >
4040
<intent-filter>
4141
<action android:name="android.intent.action.MAIN" />
4242

@@ -46,12 +46,12 @@
4646
<activity
4747
android:name="com.projecttango.experiments.javaarealearning.AreaLearningActivity"
4848
android:label="@string/app_name"
49-
android:screenOrientation="landscape">
49+
android:screenOrientation="nosensor">
5050
</activity>
5151
<activity
5252
android:name="com.projecttango.experiments.javaarealearning.ADFUUIDListViewActivity"
5353
android:label="@string/app_name"
54-
android:screenOrientation="landscape">
54+
android:screenOrientation="nosensor">
5555
</activity>
5656
</application>
5757

AreaLearningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ADFDataSource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.widget.Toast;
2525

2626
import java.util.ArrayList;
27-
import java.util.List;
2827

2928
/**
3029
* This class interfaces a Tango Object and maintains a full list of ADF UUIds. Whenever an adf is

AreaLearningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ADFUUIDListViewActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.io.File;
4141
import java.util.Arrays;
4242

43+
4344
/**
4445
* This class lets you manage ADFs between this class's Application Package folder and API private
4546
* 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) {
241242
mUUIDListView.setAdapter(mADFAdapter);
242243
}
243244

244-
245245
/**
246246
* Implements SetADFNameDialog.CallbackListener.
247247
*/
248248
@Override
249249
public void onAdfNameCancelled() {
250-
// Nothing to do here.
250+
// Nothing to do here.
251251
}
252252
}
253253

0 commit comments

Comments
 (0)