Merge pull request #89 from adamantivm/copyright

Final pre-release nits
ekumenlabs · Apr 25, 2017 · d143e4d · d143e4d
2 parents 6eb7281 + d05dba6
commit d143e4d
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 85 deletions.
diff --git a/tangobot_app/app/build.gradle b/tangobot_app/app/build.gradle
@@ -1,76 +1,80 @@
 /*
- * Copyright (C) 2014 Juan Ignacio Ubeira.
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
- * 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
+ * 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
+ *      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.
+ * 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.
  */
 
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.2"
-  defaultConfig {
-    minSdkVersion 15
-    targetSdkVersion 22
-    versionCode 1
-    versionName "1.0"
-  }
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
-  lintOptions {
-    abortOnError = false
-  }
+    defaultConfig {
+        applicationId "com.ekumen.tangobot"
+        minSdkVersion 15
+        targetSdkVersion 22
+        versionName project.catkin.pkg.version
+        // NOTE: This code needs to be updated manually on every new version
+        // release
+        versionCode 1
+    }
+
+    lintOptions {
+        abortOnError = false
+    }
 
-  externalNativeBuild {
-    ndkBuild {
-      path 'src/main/cpp/Android.mk'
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/cpp/Android.mk'
+        }
     }
-  }
 
-  defaultConfig {
-    ndk {
-      // Specifies the ABI configurations of your native
-      // libraries Gradle should build and package with your APK.
-      abiFilters 'armeabi-v7a'
+    defaultConfig {
+        ndk {
+            // Specifies the ABI configurations of your native
+            // libraries Gradle should build and package with your APK.
+            abiFilters 'armeabi-v7a'
+        }
     }
-  }
 }
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(dir: 'libs', include: ['*.jar'])
 
-  // Rosjava dependencies
-  compile('org.ros.android_core:android_10:[0.3, 0.4)') {
-    exclude group: 'junit'
-    exclude group: 'xml-apis'
-    exclude group: 'org.ros.rosjava_core'
-  }
+    // Rosjava dependencies
+    compile('org.ros.android_core:android_10:[0.3, 0.4)') {
+        exclude group: 'junit'
+        exclude group: 'xml-apis'
+        exclude group: 'org.ros.rosjava_core'
+    }
 
-  compile 'org.ros.rosjava_core:rosjava:[0.3, 0.4)'
-  compile 'org.ros.rosjava_core:rosjava_geometry:[0.3, 0.4)'
-  compile 'org.ros.rosjava_messages:std_msgs:[0.3,)'
-  compile 'org.ros.rosjava_messages:sensor_msgs:[0.3,)'
-  compile 'org.ros.rosjava_messages:geometry_msgs:[0.3,)'
-  compile 'org.ros.rosjava_core:rosjava_helpers:[0.3, 0.4)'
+    compile 'org.ros.rosjava_core:rosjava:[0.3, 0.4)'
+    compile 'org.ros.rosjava_core:rosjava_geometry:[0.3, 0.4)'
+    compile 'org.ros.rosjava_core:rosjava_helpers:[0.3, 0.4)'
+    compile 'org.ros.rosjava_messages:std_msgs:[0.5,0.6)'
+    compile 'org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)'
+    compile 'org.ros.rosjava_messages:geometry_msgs:[1.12,1.13)'
 
-  // External libraries
-  compile 'com.hoho.android:usb-serial-for-android:[0.2, 0.3)'
-  compile 'com.ekumen.base_controller:base_controller_lib:[0.2, 0.3)'
-  compile 'org.yaml:snakeyaml:[1.17, 1.18)'
+    // External libraries
+    compile 'com.hoho.android:usb-serial-for-android:[0.2, 0.3)'
+    compile 'com.ekumen.base_controller:base_controller_lib:[0.2, 0.3)'
+    compile 'org.yaml:snakeyaml:[1.17, 1.18)'
 
-  // Core Tango node
-  compile 'eu.intermodalics:tango_ros_node:[1.0, 1.1)'
+    // Core Tango node
+    compile 'eu.intermodalics:tango_ros_node:[1.0, 1.1)'
 
-  // Android libraries
-  compile 'com.android.support:support-v4:25.2.0'
-  compile 'com.android.support:design:25.2.0'
+    // Android libraries
+    compile 'com.android.support:support-v4:25.2.0'
+    compile 'com.android.support:design:25.2.0'
 }
diff --git a/tangobot_app/app/src/main/AndroidManifest.xml b/tangobot_app/app/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.ekumen.tangobot.application"
-    android:versionCode="1"
-    android:versionName="1.0">
+    package="com.ekumen.tangobot.application">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/tangobot_app/app/src/main/java/com/ekumen/tangobot/application/MainActivity.java b/tangobot_app/app/src/main/java/com/ekumen/tangobot/application/MainActivity.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2017 Ekumen, Inc.
+/**
+ * Copyright 2017 Ekumen, Inc.  All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,7 +73,8 @@
 
 public class MainActivity extends AppCompatRosActivity implements TangoRosNode.CallbackListener {
     private static final String ACTION_USB_PERMISSION = "com.github.rosjava.android.androidp1.USB_PERMISSION";
-    public final static String APP_NAME = "TangoBotApp";
+    public final static String NOTIFICATION_TITLE = "Tangobot";
+    public final static String NOTIFICATION_TICKER = "Tangobot application running. Touch here to initiate shutdown.";
 
     private Log mLog = LogFactory.getLog(MainActivity.class);
     private NodeMainExecutor mNodeMainExecutor = null;
@@ -140,7 +141,7 @@ public void execute() {
         });
 
     public MainActivity() {
-        super(APP_NAME, APP_NAME, SettingsActivity.class, MASTER_CHOOSER_REQUEST_CODE);
+        super(NOTIFICATION_TICKER, NOTIFICATION_TITLE, SettingsActivity.class, MASTER_CHOOSER_REQUEST_CODE);
         mUsbDeviceLatch = new CountDownLatch(1);
     }
 

diff --git a/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/DefaultMapTfPublisherNode.java b/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/DefaultMapTfPublisherNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ekumen, Inc.
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/DefaultRobotTfPublisherNode.java b/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/DefaultRobotTfPublisherNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ekumen, Inc.
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/ExtrinsicsTfPublisherNode.java b/tangobot_app/app/src/main/java/com/ekumen/tangobot/nodes/ExtrinsicsTfPublisherNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ekumen, Inc.
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/tangobot_app/build.gradle b/tangobot_app/build.gradle
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2014 Juan Ignacio Ubeira
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
- * 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
+ * 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
+ *      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.
+ * 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.
  */
 
 task wrapper(type: Wrapper) {

diff --git a/tangobot_app/package.xml b/tangobot_app/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>tangobot_app</name>
-  <version>0.1.0</version>
+  <version>1.0.1</version>
   <description>The tangobot_app package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag --> 

diff --git a/tangobot_app/settings.gradle b/tangobot_app/settings.gradle
@@ -1,21 +1,17 @@
 /*
- * Copyright (C) 2014 Juan Ignacio Ubeira
+ * Copyright 2017 Ekumen, Inc. All Rights Reserved.
  *
- * 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
+ * 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
+ *      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.
+ * 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.
  */
 
-/* Uncomment these and add your own packages to be gradled
-include 'my_android_project'
-include 'my_android_library_project'
-*/
 include 'app'