Skip to content
This repository was archived by the owner on Mar 17, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@

# Android Studio
*.idea/
*gradle*
*.gradle
*local.properties
*build
*production
Expand All @@ -39,6 +37,8 @@
*.ipr
*~
*.swp
.gradle
.gradle/

*/build
*/production
Expand All @@ -54,5 +54,6 @@
*.idea/datasources.xml
*.idea/dataSources.ids


#Robotium

4 changes: 2 additions & 2 deletions Apps/Canobie_Physics_v2/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
android:versionName="2.2" >

<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="19" />
android:minSdkVersion="L"
android:targetSdkVersion="L" />
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it really "L", not "20" or something of the like?


<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
35 changes: 35 additions & 0 deletions Apps/Canobie_Physics_v2/build.gradle
Original file line number Diff line number Diff line change
@@ -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/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... 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')
}
}
2 changes: 1 addition & 1 deletion Apps/Canobie_Physics_v2/project.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
target=android-19
android.library.reference.1=../../Libs/iSENSE Imports
android.library.reference.1=../iSENSE Imports
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This worries me slightly.. why doesn't it go back through the /Libs directory for iSENSE Imports? The code change implies iSENSE Imports is in the /Apps directory now. That or Canobie is in the /Libs.

96 changes: 96 additions & 0 deletions Apps/Canobie_Physics_v2/res/layout-v11/main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/main_background"
android:keepScreenOn="true"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop = "10dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:orientation="vertical" >

<TextView
android:id="@+id/menuPrompt"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="15dp"
android:text="@string/menuDirections"
android:textSize="15sp" />

<TextView
android:id="@+id/time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/timeElapsed"
android:textSize="14sp"
android:textStyle="bold" />

<TextView
android:id="@+id/ridename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/rideAndSeat"
android:textSize="14sp" />
</LinearLayout>


<LinearLayout
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical" >

<Button
android:id="@+id/startStop"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="20dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:layout_marginTop="20dp"
android:text="@string/startString"
android:background="@drawable/button_rsense"
android:textColor="#0066FF"
android:textSize="30sp" />

</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:orientation="vertical" >

<TextView
android:id="@+id/values"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@android:color/transparent"
android:text="@string/xyz"
android:textSize="24sp"
android:textStyle="bold"
android:typeface="monospace"/>

<ToggleButton
android:id="@+id/tbGravity"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOff="Do Not Include Gravity"
android:textOn="Include Gravity" />
</LinearLayout>

</LinearLayout>

96 changes: 96 additions & 0 deletions Apps/Canobie_Physics_v2/res/layout-v20/main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/main_background"
android:keepScreenOn="true"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop = "10dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:orientation="vertical" >

<TextView
android:id="@+id/menuPrompt"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="15dp"
android:text="@string/menuDirections"
android:textSize="15sp" />

<TextView
android:id="@+id/time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/timeElapsed"
android:textSize="14sp"
android:textStyle="bold" />

<TextView
android:id="@+id/ridename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/rideAndSeat"
android:textSize="14sp" />
</LinearLayout>


<LinearLayout
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical" >

<Button
android:id="@+id/startStop"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="20dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:layout_marginTop="20dp"
android:text="@string/startString"
android:background="@drawable/button_rsense"
android:textColor="#0066FF"
android:textSize="30sp" />

</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:orientation="vertical" >

<TextView
android:id="@+id/values"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@android:color/transparent"
android:text="@string/xyz"
android:textSize="24sp"
android:textStyle="bold"
android:typeface="monospace"/>

<ToggleButton
android:id="@+id/tbGravity"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textOff="Do Not Include Gravity"
android:textOn="Include Gravity" />
</LinearLayout>

</LinearLayout>

68 changes: 68 additions & 0 deletions Apps/Car_Ramp_Physics/res/layout-land-v20/main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:keepScreenOn="true"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@android:color/black"
android:orientation="vertical" >

<TextView
android:id="@+id/values"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/black"
android:gravity="center"
android:text="@string/yString"
android:textColor="@android:color/white"
android:textSize="18sp"
android:textStyle="bold" />


</LinearLayout>

<LinearLayout
android:id="@+id/lalala"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" >

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gravity"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />

<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textOff=""
android:textOn=""
android:checked="false" />
</LinearLayout>

<Button
android:id="@+id/startStop"
android:layout_width="fill_parent"
android:layout_height="0dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="10dp"
android:layout_weight="0.79"
android:background="@drawable/button_rsense"
android:text="@string/holdToStart"
android:textColor="#0066FF"
android:textSize="30sp" />

</LinearLayout>
Loading