diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-30 23:51:53 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-30 23:51:53 +0100 |
commit | 61bdbbdc3f81b89ce1679075664fe50012ccd78d (patch) | |
tree | 97c4fa0190406812cb5159433fc398c950f1da3c /app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | |
parent | 991620666551c1eaf655a0aa0b1fe08d2bc19681 (diff) | |
download | io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.gz io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.bz2 io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.tar.xz io.trygvis.soilmoisture-android-61bdbbdc3f81b89ce1679075664fe50012ccd78d.zip |
o Activating the sensor view.
Diffstat (limited to 'app/src/main/java/io/trygvis/soilmoisture/MainActivity.java')
-rw-r--r-- | app/src/main/java/io/trygvis/soilmoisture/MainActivity.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java index 6996ef8..984016a 100644 --- a/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java +++ b/app/src/main/java/io/trygvis/soilmoisture/MainActivity.java @@ -103,6 +103,10 @@ public class MainActivity extends ListActivity { red = getResources().getColor(R.color.red); setContentView(R.layout.main); + + // This will be replaced quite fast, but when resuming it needs to be here. + deviceList = new DeviceListAdapter(); + setListAdapter(deviceList); } @Override @@ -270,12 +274,12 @@ public class MainActivity extends ListActivity { private void onSensorClick(SmSensor sensor) { Log.i(TAG, "onSensorClick, device=" + sensor.getDevice().getBtDevice().getId() + "/" + sensor.getIndex()); - sensor.readCurrentValue(); +// sensor.readCurrentValue(); -// Intent intent = new Intent(this, SensorActivity.class); -// intent.putExtra(SensorActivity.EXTRA_ADDRESS, sensor.getDevice().getBtDevice().getAddress()); -// intent.putExtra(SensorActivity.EXTRA_NUMBER, sensor.getIndex()); -// startActivity(intent); + Intent intent = new Intent(this, SensorActivity.class); + intent.putExtra(SensorActivity.EXTRA_ADDRESS, sensor.getDevice().getBtDevice().getAddress()); + intent.putExtra(SensorActivity.EXTRA_NUMBER, sensor.getIndex()); + startActivity(intent); } // ----------------------------------------------------------------------- |