diff --git a/.gitignore b/.gitignore
index 3e1ee79c..3616a891 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,6 @@
# Android Studio
*.idea/
-*gradle*
-*.gradle
*local.properties
*build
*production
@@ -39,6 +37,8 @@
*.ipr
*~
*.swp
+.gradle
+.gradle/
*/build
*/production
@@ -54,5 +54,6 @@
*.idea/datasources.xml
*.idea/dataSources.ids
+
#Robotium
diff --git a/Apps/Canobie_Physics_v2/AndroidManifest.xml b/Apps/Canobie_Physics_v2/AndroidManifest.xml
index acb5abc8..a9b801fb 100644
--- a/Apps/Canobie_Physics_v2/AndroidManifest.xml
+++ b/Apps/Canobie_Physics_v2/AndroidManifest.xml
@@ -5,8 +5,8 @@
android:versionName="2.2" >
+ android:minSdkVersion="L"
+ android:targetSdkVersion="L" />
diff --git a/Apps/Canobie_Physics_v2/build.gradle b/Apps/Canobie_Physics_v2/build.gradle
new file mode 100644
index 00000000..6ec8225c
--- /dev/null
+++ b/Apps/Canobie_Physics_v2/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'android'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: '*.jar')
+ compile project(':Libs:iSENSE Imports')
+}
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion "20.0.0"
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+
+ // Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
+
+ // Move the build types to build-types/
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
diff --git a/Apps/Canobie_Physics_v2/project.properties b/Apps/Canobie_Physics_v2/project.properties
index 88cab158..08029d98 100644
--- a/Apps/Canobie_Physics_v2/project.properties
+++ b/Apps/Canobie_Physics_v2/project.properties
@@ -1,2 +1,2 @@
target=android-19
-android.library.reference.1=../../Libs/iSENSE Imports
+android.library.reference.1=../iSENSE Imports
diff --git a/Apps/Canobie_Physics_v2/res/layout-v11/main.xml b/Apps/Canobie_Physics_v2/res/layout-v11/main.xml
new file mode 100644
index 00000000..7584cb53
--- /dev/null
+++ b/Apps/Canobie_Physics_v2/res/layout-v11/main.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Apps/Canobie_Physics_v2/res/layout-v20/main.xml b/Apps/Canobie_Physics_v2/res/layout-v20/main.xml
new file mode 100644
index 00000000..7584cb53
--- /dev/null
+++ b/Apps/Canobie_Physics_v2/res/layout-v20/main.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Apps/Car_Ramp_Physics/res/layout-land-v20/main.xml b/Apps/Car_Ramp_Physics/res/layout-land-v20/main.xml
new file mode 100644
index 00000000..644d0815
--- /dev/null
+++ b/Apps/Car_Ramp_Physics/res/layout-land-v20/main.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Apps/Car_Ramp_Physics/res/layout-v20/main.xml b/Apps/Car_Ramp_Physics/res/layout-v20/main.xml
new file mode 100644
index 00000000..cbaf9338
--- /dev/null
+++ b/Apps/Car_Ramp_Physics/res/layout-v20/main.xml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Apps/Car_Ramp_Physics/res/layout/drawer_item_row.xml b/Apps/Car_Ramp_Physics/res/layout/drawer_item_row.xml
new file mode 100644
index 00000000..5fd6527c
--- /dev/null
+++ b/Apps/Car_Ramp_Physics/res/layout/drawer_item_row.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/Apps/DataWalk/AndroidManifest.xml b/Apps/DataWalk/AndroidManifest.xml
index 35a16f38..e7653053 100644
--- a/Apps/DataWalk/AndroidManifest.xml
+++ b/Apps/DataWalk/AndroidManifest.xml
@@ -14,8 +14,8 @@
+ android:minSdkVersion="L"
+ android:targetSdkVersion="L" />
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
diff --git a/Apps/DataWalk/src/edu/uml/cs/isense/datawalk_v2/DataWalk.java b/Apps/DataWalk/src/edu/uml/cs/isense/datawalk_v2/DataWalk.java
index f9ca25ec..65e0cab6 100644
--- a/Apps/DataWalk/src/edu/uml/cs/isense/datawalk_v2/DataWalk.java
+++ b/Apps/DataWalk/src/edu/uml/cs/isense/datawalk_v2/DataWalk.java
@@ -174,7 +174,6 @@ public void onCreate(Bundle savedInstanceState) {
// Initialize action bar customization for API >= 11
if (android.os.Build.VERSION.SDK_INT >= 11) {
ActionBar bar = getActionBar();
-
// make the actionbar clickable
bar.setDisplayHomeAsUpEnabled(true);
}
diff --git a/Apps/Data_Collector/AndroidManifest.xml b/Apps/Data_Collector/AndroidManifest.xml
index 0cbdee2f..7004f273 100644
--- a/Apps/Data_Collector/AndroidManifest.xml
+++ b/Apps/Data_Collector/AndroidManifest.xml
@@ -6,8 +6,8 @@
android:versionName="4.1.2">
+ android:minSdkVersion="L"
+ android:targetSdkVersion="L" />
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
diff --git a/Apps/Data_Collector/project.properties b/Apps/Data_Collector/project.properties
index 88cab158..08029d98 100644
--- a/Apps/Data_Collector/project.properties
+++ b/Apps/Data_Collector/project.properties
@@ -1,2 +1,2 @@
target=android-19
-android.library.reference.1=../../Libs/iSENSE Imports
+android.library.reference.1=../iSENSE Imports
diff --git a/Apps/Motion/AndroidManifest.xml b/Apps/Motion/AndroidManifest.xml
index 426c1192..e68ada75 100644
--- a/Apps/Motion/AndroidManifest.xml
+++ b/Apps/Motion/AndroidManifest.xml
@@ -45,11 +45,6 @@
android:label="@string/about_title"
android:theme="@style/AppTheme" >
-
-
-
+ android:theme="@style/AppThemeNoActionBarDark" />
-
-
-
+
+
+
+
diff --git a/Apps/Motion/build.gradle b/Apps/Motion/build.gradle
new file mode 100644
index 00000000..824e6388
--- /dev/null
+++ b/Apps/Motion/build.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'android'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: '*.jar')
+ compile project(':Libs:iSENSE Imports')
+ compile "com.android.support:support-v4:21.0.2"
+ compile "com.android.support:appcompat-v7:21.0.2"
+}
+
+android {
+ compileSdkVersion 21
+ buildToolsVersion "21.1.1"
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ assets.srcDirs = ['assets']
+ }
+
+ // Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
+
+ // Move the build types to build-types/
+ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
+ // This moves them out of them default location under src//... which would
+ // conflict with src/ being used by the main source set.
+ // Adding new build types or product flavors should be accompanied
+ // by a similar customization.
+ debug.setRoot('build-types/debug')
+ release.setRoot('build-types/release')
+ }
+}
diff --git a/Apps/Motion/res/layout-land-v14/record_settings.xml b/Apps/Motion/res/layout-land-v11/record_settings.xml
similarity index 100%
rename from Apps/Motion/res/layout-land-v14/record_settings.xml
rename to Apps/Motion/res/layout-land-v11/record_settings.xml
diff --git a/Apps/Motion/res/layout-v14/contrib_key.xml b/Apps/Motion/res/layout-v11/contrib_key.xml
similarity index 100%
rename from Apps/Motion/res/layout-v14/contrib_key.xml
rename to Apps/Motion/res/layout-v11/contrib_key.xml
diff --git a/Apps/Motion/res/layout-v14/duration_dialog.xml b/Apps/Motion/res/layout-v11/duration_dialog.xml
similarity index 76%
rename from Apps/Motion/res/layout-v14/duration_dialog.xml
rename to Apps/Motion/res/layout-v11/duration_dialog.xml
index 19c428cf..bbdda2be 100644
--- a/Apps/Motion/res/layout-v14/duration_dialog.xml
+++ b/Apps/Motion/res/layout-v11/duration_dialog.xml
@@ -1,17 +1,33 @@
+
+
+
+
+
+
-
-
-
-
-
-
+ android:layout_height="wrap_content">
+
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@android:string/cancel"
+ android:layout_weight="1"/>
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@android:string/ok"
+ android:layout_weight="1"/>
+
\ No newline at end of file
diff --git a/Apps/Motion/res/layout-v11/help.xml b/Apps/Motion/res/layout-v11/help.xml
new file mode 100644
index 00000000..2e3d1878
--- /dev/null
+++ b/Apps/Motion/res/layout-v11/help.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Apps/Motion/res/layout-v14/login.xml b/Apps/Motion/res/layout-v11/login.xml
similarity index 100%
rename from Apps/Motion/res/layout-v14/login.xml
rename to Apps/Motion/res/layout-v11/login.xml
diff --git a/Apps/Motion/res/layout-v14/main.xml b/Apps/Motion/res/layout-v11/main.xml
similarity index 100%
rename from Apps/Motion/res/layout-v14/main.xml
rename to Apps/Motion/res/layout-v11/main.xml
diff --git a/Apps/Motion/res/layout-v14/message_template.xml b/Apps/Motion/res/layout-v11/message_template.xml
similarity index 100%
rename from Apps/Motion/res/layout-v14/message_template.xml
rename to Apps/Motion/res/layout-v11/message_template.xml
diff --git a/Apps/Motion/res/layout-v11/presets.xml b/Apps/Motion/res/layout-v11/presets.xml
new file mode 100644
index 00000000..dba9e426
--- /dev/null
+++ b/Apps/Motion/res/layout-v11/presets.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Apps/Motion/res/layout-v14/rate_dialog.xml b/Apps/Motion/res/layout-v11/rate_dialog.xml
similarity index 75%
rename from Apps/Motion/res/layout-v14/rate_dialog.xml
rename to Apps/Motion/res/layout-v11/rate_dialog.xml
index e845b8d3..8b339e65 100644
--- a/Apps/Motion/res/layout-v14/rate_dialog.xml
+++ b/Apps/Motion/res/layout-v11/rate_dialog.xml
@@ -4,10 +4,25 @@
android:layout_height="match_parent"
android:orientation="vertical" >
+
+
+
+
+
+ android:layout_height="wrap_content"
+ android:layout_gravity="center">
-
+
-
+
-
-
-
-
+ android:layout_height="wrap_content">
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@android:string/cancel"
+ android:layout_weight="1"/>
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@android:string/ok"
+ android:layout_weight="1"/>
+
-
\ No newline at end of file
+
diff --git a/Apps/Motion/res/layout-v14/record_settings.xml b/Apps/Motion/res/layout-v11/record_settings.xml
similarity index 100%
rename from Apps/Motion/res/layout-v14/record_settings.xml
rename to Apps/Motion/res/layout-v11/record_settings.xml
diff --git a/Apps/Motion/res/layout-v14/reset.xml b/Apps/Motion/res/layout-v11/reset.xml
similarity index 78%
rename from Apps/Motion/res/layout-v14/reset.xml
rename to Apps/Motion/res/layout-v11/reset.xml
index bbb88c75..7bf8330e 100644
--- a/Apps/Motion/res/layout-v14/reset.xml
+++ b/Apps/Motion/res/layout-v11/reset.xml
@@ -4,17 +4,21 @@
android:layout_height="match_parent"
android:orientation="vertical" >
+
+
+ android:layout_height="1dp"/>
+ android:layout_height="wrap_content" >
diff --git a/Apps/Motion/res/layout/rate_dialog.xml b/Apps/Motion/res/layout/rate_dialog.xml
index c078c0fd..afd7717b 100644
--- a/Apps/Motion/res/layout/rate_dialog.xml
+++ b/Apps/Motion/res/layout/rate_dialog.xml
@@ -16,7 +16,7 @@
android:checked="true"
android:onClick="onRadioButtonClicked"
android:text="50 miliseconds" />
-
+
-
-
-
-
-
+ android:layout_below="@id/edittext_initial"
+ android:orientation="horizontal"
+ android:gravity="right">
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/layout-v11/project_id.xml b/Libs/iSENSE Imports/res/layout-v11/project_id.xml
index 772978e9..e10b2db8 100644
--- a/Libs/iSENSE Imports/res/layout-v11/project_id.xml
+++ b/Libs/iSENSE Imports/res/layout-v11/project_id.xml
@@ -4,6 +4,14 @@
android:layout_height="match_parent"
android:orientation="vertical" >
+
+
@@ -75,7 +84,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
- android:text="@string/projLater"
+ style="?android:attr/button"
+ android:text="@string/projLater"
android:textSize="18sp" />
@@ -99,6 +109,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
+ style="?android:attr/button"
android:text="@string/createProject" />
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/layout-v11/queueedit_rename.xml b/Libs/iSENSE Imports/res/layout-v11/queueedit_rename.xml
index 3ae42dbf..9ff197e5 100644
--- a/Libs/iSENSE Imports/res/layout-v11/queueedit_rename.xml
+++ b/Libs/iSENSE Imports/res/layout-v11/queueedit_rename.xml
@@ -4,9 +4,16 @@
android:layout_height="match_parent"
android:orientation="vertical" >
+
+
+
-
-
-
+
-
-
-
+
-
diff --git a/Libs/iSENSE Imports/res/layout/projectrow.xml b/Libs/iSENSE Imports/res/layout/projectrow.xml
index 167659c8..94b7c4ad 100644
--- a/Libs/iSENSE Imports/res/layout/projectrow.xml
+++ b/Libs/iSENSE Imports/res/layout/projectrow.xml
@@ -22,6 +22,7 @@
android:layout_width="fill_parent"
android:layout_height="26dip"
android:layout_below="@id/toptext"
+ android:textColor="@android:color/black"
android:ellipsize="marquee"
android:singleLine="true"
android:textIsSelectable="false" />
diff --git a/Libs/iSENSE Imports/res/values-v11/styles.xml b/Libs/iSENSE Imports/res/values-v11/styles.xml
index 99947257..f623b37b 100644
--- a/Libs/iSENSE Imports/res/values-v11/styles.xml
+++ b/Libs/iSENSE Imports/res/values-v11/styles.xml
@@ -1,56 +1,37 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/values-v14/styles.xml b/Libs/iSENSE Imports/res/values-v14/styles.xml
deleted file mode 100644
index 922c1732..00000000
--- a/Libs/iSENSE Imports/res/values-v14/styles.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/values/colors.xml b/Libs/iSENSE Imports/res/values/colors.xml
index 3e5d6061..16ce7e45 100644
--- a/Libs/iSENSE Imports/res/values/colors.xml
+++ b/Libs/iSENSE Imports/res/values/colors.xml
@@ -1,9 +1,15 @@
-
+
#608CBF
#A1D3FF
#C7E5FF
#113
#FFF
+
+ #113
+ #000000
+ #000000
+
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/values/strings.xml b/Libs/iSENSE Imports/res/values/strings.xml
index e1cc7047..7ce8929d 100644
--- a/Libs/iSENSE Imports/res/values/strings.xml
+++ b/Libs/iSENSE Imports/res/values/strings.xml
@@ -158,7 +158,7 @@
A contributor key allows you to contribute data to a specific project without an iSENSE account.
Select a Project
You Can Contribute To:
- Credentials
+ Login
Logged in as:
iSense Gravatar
Log out
diff --git a/Libs/iSENSE Imports/src/edu/uml/cs/isense/drawer/DrawerItem.java b/Libs/iSENSE Imports/src/edu/uml/cs/isense/drawer/DrawerItem.java
new file mode 100644
index 00000000..beaaf6d0
--- /dev/null
+++ b/Libs/iSENSE Imports/src/edu/uml/cs/isense/drawer/DrawerItem.java
@@ -0,0 +1,10 @@
+package edu.uml.cs.isense.drawer;
+
+public class DrawerItem {
+ public String name;
+
+ public DrawerItem(String name) {
+ this.name = name;
+ }
+
+}
diff --git a/Libs/iSENSE Imports/src/edu/uml/cs/isense/proj/BrowseProjects.java b/Libs/iSENSE Imports/src/edu/uml/cs/isense/proj/BrowseProjects.java
index 4eec786f..e64a6eeb 100644
--- a/Libs/iSENSE Imports/src/edu/uml/cs/isense/proj/BrowseProjects.java
+++ b/Libs/iSENSE Imports/src/edu/uml/cs/isense/proj/BrowseProjects.java
@@ -5,6 +5,7 @@
import android.app.Activity;
import android.app.ListActivity;
import android.os.Bundle;
+import android.support.v7.widget.SearchView;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
@@ -30,51 +31,77 @@ public class BrowseProjects extends ListActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.projects);
-
- setResult(Activity.RESULT_CANCELED);
-
- m_projects = new ArrayList();
- m_adapter = new ProjectAdapter(getBaseContext(),
- R.layout.projectrow, R.layout.loadrow,
- m_projects);
- m_adapter.query = "";
- setListAdapter(m_adapter);
-
- final EditText et = (EditText) findViewById(R.id.ExperimentSearchInput);
- et.setSingleLine(true);
- et.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void afterTextChanged(Editable s) {}
-
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count,
- int after) {}
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before,
- int count) {
- if (s == null || s.length() == 0) {
- m_projects = new ArrayList();
- m_adapter = new ProjectAdapter(getBaseContext(),
- R.layout.projectrow, R.layout.loadrow,
- m_projects);
- setListAdapter(m_adapter);
- } else {
- m_projects = new ArrayList();
- m_adapter = new ProjectAdapter(getBaseContext(),
- R.layout.projectrow, R.layout.loadrow,
- m_projects);
- m_adapter.query = s.toString();
- setListAdapter(m_adapter);
- }
- }
-
- });
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.projects);
- }
+ setResult(Activity.RESULT_CANCELED);
+
+ m_projects = new ArrayList();
+ m_adapter = new ProjectAdapter(getBaseContext(),
+ R.layout.projectrow, R.layout.loadrow,
+ m_projects);
+ m_adapter.query = "";
+ setListAdapter(m_adapter);
+
+ //If api level is 11 or up layout will use SearchView, if not use textview
+ if (android.os.Build.VERSION.SDK_INT > 10) {
+ SearchView sv = (SearchView) findViewById(R.id.ExperimentSearchInput);
+ sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+ @Override
+ public boolean onQueryTextSubmit(String s) {
+ return false;
+ }
+
+ @Override
+ public boolean onQueryTextChange(String s) {
+ search(s);
+ return false;
+ }
+ });
+
+ } else {
+
+ final EditText et = (EditText) findViewById(R.id.ExperimentSearchInput);
+
+ et.addTextChangedListener(new TextWatcher() {
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ }
+
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count,
+ int after) {
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before,
+ int count) {
+ search(s.toString());
+ }
+
+ });
+ }
+ }
+
+ public void search(String s) {
+ if (s == null || s.length() == 0) {
+ m_projects = new ArrayList();
+ m_adapter = new ProjectAdapter(getBaseContext(),
+ R.layout.projectrow, R.layout.loadrow,
+ m_projects);
+ setListAdapter(m_adapter);
+ } else {
+ m_projects = new ArrayList();
+ m_adapter = new ProjectAdapter(getBaseContext(),
+ R.layout.projectrow, R.layout.loadrow,
+ m_projects);
+ m_adapter.query = s.toString();
+ setListAdapter(m_adapter);
+ }
+
+
+ }
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
diff --git a/Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QueueLayout.java b/Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QueueLayout.java
index c80e7509..3779ac07 100644
--- a/Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QueueLayout.java
+++ b/Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QueueLayout.java
@@ -1,12 +1,14 @@
package edu.uml.cs.isense.queue;
-import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
import android.util.Log;
+import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
@@ -37,7 +39,7 @@
* @author Mike Stowell and Jeremy Poulin of the iSENSE team.
*
*/
-public class QueueLayout extends Activity implements OnClickListener {
+public class QueueLayout extends ActionBarActivity implements OnClickListener {
/**
* Global string constant that the user should use to pass in the parent
@@ -47,7 +49,6 @@ public class QueueLayout extends Activity implements OnClickListener {
* the string passed to it.
*/
public static final String PARENT_NAME = "parentName";
- public static final String LOGIN_CONTEXT = "logincontext";
private static final int ALTER_DATASET_REQUESTED = 9001;
private static final int ALTER_DATA_NAME_REQUESTED = 9002;
@@ -185,7 +186,26 @@ protected void onCreate(Bundle savedInstanceState) {
scrollQueue = (LinearLayout) findViewById(R.id.scrollqueue);
fillScrollQueue();
- }
+
+ if (android.os.Build.VERSION.SDK_INT >= 11) {
+ ActionBar bar = getSupportActionBar();
+
+ // make the actionbar clickable
+ bar.setDisplayHomeAsUpEnabled(true);
+ }
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ // Respond to the action bar's Up/Home button
+ case android.R.id.home:
+ finish();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
// Works through list of data to be uploaded and creates the list of blocks
private void fillScrollQueue() {
diff --git a/Tests/CarRampTestProject/.settings/org.eclipse.jdt.core.prefs b/Tests/CarRampTestProject/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94e05ddc..00000000
--- a/Tests/CarRampTestProject/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,284 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/Tests/CarRampTestProject/.settings/org.eclipse.jdt.ui.prefs b/Tests/CarRampTestProject/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 7e8047a6..00000000
--- a/Tests/CarRampTestProject/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,56 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Java Project
-formatter_settings_version=12
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/Tests/rSENSETest/.settings/org.eclipse.jdt.core.prefs b/Tests/rSENSETest/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2dd..00000000
--- a/Tests/rSENSETest/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/Tests/rSENSETest/rSENSETest.iml b/Tests/rSENSETest/rSENSETest.iml
deleted file mode 100644
index 16b4e6d7..00000000
--- a/Tests/rSENSETest/rSENSETest.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..2482c07e
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,9 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.13.0'
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..8c0fb64a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..3832cafb
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Nov 18 19:27:17 EST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..91a7e269
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..0b3e2368
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,4 @@
+include ':Apps:Motion'
+include ':Libs:iSENSE Imports'
+include ':Apps:Pictures'
+include ':Apps:Writer'