Skip to content
This repository was archived by the owner on Feb 17, 2022. It is now read-only.

Commit a16b22c

Browse files
clarlarsclarlars
authored
Merge pull request #24 from opendatakit/development
merge dev into demo
2 parents 9da3a56 + ab1a87a commit a16b22c

File tree

10 files changed

+25
-24
lines changed

10 files changed

+25
-24
lines changed

‎sensorsframework_app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
minSdkVersion(minVersion)
2525
targetSdkVersion(targetVersion)
2626
versionCode(releaseVersionCode)
27-
versionName(versionCodeName)
27+
versionName(versionCodeName + " ALPHA")
2828
testInstrumentationRunner(instrumentationRunner)
2929
}
3030

‎sensorsframework_app/src/main/java/org/opendatakit/sensors/manager/DatabaseManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private static class DatabaseHelper extends SQLiteOpenHelper {
112112
db.execSQL("CREATE TABLE " + InternalSensorTable.TABLE_NAME + " (" +
113113
InternalSensorTable.ID + " TEXT PRIMARY KEY," +
114114
InternalSensorTable.APP_NAME + " TEXT," +
115-
ExternalSensorTable.DB_TRANSFER + " TEXT" + ");");
115+
InternalSensorTable.DB_TRANSFER + " TEXT" + ");");
116116

117117
} catch (SQLException e) {
118118
Log.w(LOGTAG, "DatabaseHelper onCreate Failed!");
@@ -615,7 +615,7 @@ public synchronized List<ExternalSensorData> externalSensorList(CommunicationCha
615615

616616
// query columns
617617
String[] cols = { ExternalSensorTable.ID, ExternalSensorTable.NAME, ExternalSensorTable.TYPE,
618-
ExternalSensorTable.STATE, ExternalSensorTable.APP_NAME };
618+
ExternalSensorTable.STATE, ExternalSensorTable.APP_NAME, ExternalSensorTable.DB_TRANSFER };
619619
String[] args = { type.name() };
620620

621621
// run query

‎sensorsframework_app/src/main/res/layout/add_sensor.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:onClick="addUSBAction"
1313
android:layout_marginTop="5dp"
1414
android:padding="20dp"
15-
android:text="@+string/add_usb_device"
15+
android:text="@string/add_usb_device"
1616
android:textSize="21sp" />
1717

1818
<Button
@@ -21,7 +21,7 @@
2121
android:onClick="addBluetoothAction"
2222
android:layout_marginTop="5dp"
2323
android:padding="20dp"
24-
android:text="@+string/add_bluetooth_device"
24+
android:text="@string/add_bluetooth_device"
2525
android:textSize="21sp" />
2626

2727
</LinearLayout>

‎sensorsframework_app/src/main/res/layout/metadata_dialog.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:id="@+id/meta_name_title"
99
android:layout_width="fill_parent"
1010
android:layout_height="wrap_content"
11-
android:text="@+string/select_sensor_type"
11+
android:text="@string/select_sensor_type"
1212
android:textStyle="bold"
1313
android:textSize="21sp"
1414
/>

‎sensorsframework_app/src/main/res/layout/register.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:layout_height="wrap_content"
1313
android:layout_marginTop="5dp"
1414
android:padding="20dp"
15-
android:text="@+string/register_sensor"
15+
android:text="@string/register_sensor"
1616
android:textSize="21sp" >
1717
</Button>
1818

‎sensorsframework_app/src/main/res/layout/selection_help.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@
2121
android:layout_height="0dip"
2222
android:layout_weight="1"
2323
android:singleLine="true"
24-
android:text="@+string/sensor_ready"
24+
android:text="@string/sensor_ready"
2525
/>
2626
<TextView
2727
android:layout_width="fill_parent"
2828
android:layout_height="0dip"
2929
android:layout_weight="1"
3030
android:singleLine="true"
31-
android:text="@+string/record_from_sensor"
31+
android:text="@string/record_from_sensor"
3232
android:textSize="21sp"
3333
/>
3434
<TextView
3535
android:layout_width="fill_parent"
3636
android:layout_height="0dip"
3737
android:layout_weight="1"
3838
android:singleLine="true"
39-
android:text="@+string/update_metadata"
39+
android:text="@string/update_metadata"
4040
android:textSize="21sp"
4141
/>
4242
</LinearLayout>
@@ -59,23 +59,23 @@
5959
android:layout_height="0dip"
6060
android:layout_weight="1"
6161
android:singleLine="true"
62-
android:text="@+string/sensor_out_of_range"
62+
android:text="@string/sensor_out_of_range"
6363
android:textSize="21sp"
6464
/>
6565
<TextView
6666
android:layout_width="fill_parent"
6767
android:layout_height="0dip"
6868
android:layout_weight="1"
6969
android:singleLine="true"
70-
android:text="@+string/open_record"
70+
android:text="@string/open_record"
7171
android:textSize="21sp"
7272
/>
7373
<TextView
7474
android:layout_width="fill_parent"
7575
android:layout_height="0dip"
7676
android:layout_weight="1"
7777
android:singleLine="true"
78-
android:text="@+string/update_metadata"
78+
android:text="@string/update_metadata"
7979
android:textSize="21sp"
8080
/>
8181
</LinearLayout>
@@ -98,23 +98,23 @@
9898
android:layout_height="0dip"
9999
android:layout_weight="1"
100100
android:singleLine="true"
101-
android:text="@+string/register_sensor"
101+
android:text="@string/register_sensor"
102102
android:textSize="21sp"
103103
/>
104104
<TextView
105105
android:layout_width="fill_parent"
106106
android:layout_height="0dip"
107107
android:layout_weight="1"
108108
android:singleLine="true"
109-
android:text="@+string/register"
109+
android:text="@string/register"
110110
android:textSize="16sp"
111111
/>
112112
<TextView
113113
android:layout_width="fill_parent"
114114
android:layout_height="0dip"
115115
android:layout_weight="1"
116116
android:singleLine="true"
117-
android:text="@+string/update_metadata"
117+
android:text="@string/update_metadata"
118118
android:textSize="21sp"
119119
/>
120120
</LinearLayout>
@@ -145,15 +145,15 @@
145145
android:layout_height="0dip"
146146
android:layout_weight="1"
147147
android:singleLine="true"
148-
android:text="@+string/pair_device_with_phone"
148+
android:text="@string/pair_device_with_phone"
149149
android:textSize="21sp"
150150
/>
151151
<TextView
152152
android:layout_width="fill_parent"
153153
android:layout_height="0dip"
154154
android:layout_weight="1"
155155
android:singleLine="true"
156-
android:text="@+string/long_click_no_action"
156+
android:text="@string/long_click_no_action"
157157
android:textSize="21sp"
158158
/>
159159
</LinearLayout>
@@ -176,23 +176,23 @@
176176
android:layout_height="0dip"
177177
android:layout_weight="1"
178178
android:singleLine="true"
179-
android:text="@+string/not_a_sensor"
179+
android:text="@string/not_a_sensor"
180180
android:textSize="21sp"
181181
/>
182182
<TextView
183183
android:layout_width="fill_parent"
184184
android:layout_height="0dip"
185185
android:layout_weight="1"
186186
android:singleLine="true"
187-
android:text="@+string/single_click_no_action"
187+
android:text="@string/single_click_no_action"
188188
android:textSize="21sp"
189189
/>
190190
<TextView
191191
android:layout_width="fill_parent"
192192
android:layout_height="0dip"
193193
android:layout_weight="1"
194194
android:singleLine="true"
195-
android:text="@+string/update_metadata"
195+
android:text="@string/update_metadata"
196196
android:textSize="21sp"
197197
/>
198198
</LinearLayout>

‎sensorsframework_app/src/main/res/layout/sensor_selection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_height="wrap_content"
4545
android:layout_marginTop="5dp"
4646
android:padding="20dp"
47-
android:text="@+string/help"
47+
android:text="@string/help"
4848
android:textSize="21sp" >
4949
</Button>
5050
</LinearLayout>

‎sensorsframework_app/src/main/res/layout/usb_sensor_selection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:layout_weight="1"
3434
android:layout_marginTop="5dp"
3535
android:padding="20dp"
36-
android:text="@+string/help"
36+
android:text="@string/help"
3737
android:textSize="21sp" >
3838
</Button>
3939
</LinearLayout>

‎sensorsframework_app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919
<string name="long_click_no_action">Long Click: No Action</string>
2020
<string name="single_click_no_action">Single Click: No Action</string>
2121
<string name="not_a_sensor">NOT A SENSOR</string>
22+
<string name="select_sensor_type">Select Sensor Type</string>
2223
</resources>

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gradle.ext.gradleConfigVersion = 115
1+
gradle.ext.gradleConfigVersion = 116
22

33
if (!gradle.ext.has('workspacePath')) {
44
def env = System.getProperties();

0 commit comments

Comments
 (0)