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

Commit 6baf373

Browse files
committed
Merge pull request #33 from googlesamples/release-quine-updated
Release Quine
2 parents e6edf80 + 169dea4 commit 6baf373

207 files changed

Lines changed: 2154 additions & 434 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/.classpath

Lines changed: 0 additions & 9 deletions
This file was deleted.

AreaLearningJava/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.gradle
2+
/local.properties
3+
/.idea/workspace.xml
4+
/.idea/libraries
5+
.DS_Store
6+
/build
7+
/captures

AreaLearningJava/.project

Lines changed: 0 additions & 33 deletions
This file was deleted.

AreaLearningJava/app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

AreaLearningJava/app/build.gradle

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 19
5+
buildToolsVersion "21.1.2"
6+
7+
defaultConfig {
8+
applicationId "com.projecttango.experiments.javaarealearning"
9+
minSdkVersion 19
10+
targetSdkVersion 19
11+
versionCode 1
12+
versionName "1.0"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
lintOptions {
21+
abortOnError false
22+
}
23+
}
24+
25+
if (project.hasProperty("Tango.signing")
26+
&& new File(project.property("Tango.signing") + "/tango.gradle").exists()) {
27+
apply from: project.property("Tango.signing") + "/tango.gradle";
28+
}
29+
30+
def external_lib_prefix = null
31+
if (project.hasProperty("Tango.catkin_devel_prefix")) {
32+
external_lib_prefix = project.property("Tango.catkin_devel_prefix")
33+
} else {
34+
// Building in standalone sample form.
35+
external_lib_prefix = "../../TangoReleaseLibs"
36+
}
37+
38+
dependencies {
39+
compile fileTree(dir: external_lib_prefix + '/jar', include: ['**/*.jar'])
40+
compile(name: 'TangoUtils', ext: 'aar')
41+
}
42+
43+
repositories{
44+
flatDir{
45+
dirs external_lib_prefix + '/aar'
46+
}
47+
}
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# To enable ProGuard in your project, edit project.properties
2-
# to define the proguard.config property as described in that file.
3-
#
41
# Add project specific ProGuard rules here.
52
# By default, the flags in this file are appended to flags specified
6-
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7-
# You can edit the include path and order by changing the ProGuard
8-
# include property in project.properties.
3+
# in /opt/android-sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
96
#
107
# For more details, see
118
# http://developer.android.com/guide/developing/tools/proguard.html
File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

AreaLearningJava/src/com/projecttango/experiments/javaarealearning/ALRenderer.java renamed to AreaLearningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ALRenderer.java

File renamed without changes.

0 commit comments

Comments
 (0)