diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-27 21:23:50 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-01-27 21:23:50 +0100 |
commit | c4685214d8db34166213ffa373a16af1a99401a5 (patch) | |
tree | 56e24e25119f28ff8c0a730c4d5313bc523a5c66 /app/src/main/AndroidManifest.xml | |
parent | 138b49247a72890df66af9a01e1179dab72a4b71 (diff) | |
download | io.trygvis.soilmoisture-android-c4685214d8db34166213ffa373a16af1a99401a5.tar.gz io.trygvis.soilmoisture-android-c4685214d8db34166213ffa373a16af1a99401a5.tar.bz2 io.trygvis.soilmoisture-android-c4685214d8db34166213ffa373a16af1a99401a5.tar.xz io.trygvis.soilmoisture-android-c4685214d8db34166213ffa373a16af1a99401a5.zip |
o Adding 'recently seen' on BtDevice. Updated when scanning.
o Removing BtScanResult, it was never used.
o Getting MainActivity to listen on device property changed so the UI is properly updated.
o Adding a status bar with color to indicate if the device is available, connected or not seen.
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r-- | app/src/main/AndroidManifest.xml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 500bd8d..3edd865 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="io.trygvis.soilmoisture"> +<manifest + xmlns:android="http://schemas.android.com/apk/res/android" + package="io.trygvis.soilmoisture"> <!-- Declare this required feature if you want to make the app available to BLE-capable @@ -21,7 +22,6 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/AppTheme"> - <activity android:name=".MainActivity" android:label="@string/app_name"> @@ -31,7 +31,6 @@ <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - <activity android:name=".SoilActivity" android:label="@string/title_activity_soil"> @@ -45,7 +44,6 @@ android:name="io.trygvis.android.bt.DefaultBtService.migration" android:value="db/migration/sm"/> </service> - <service android:name=".DefaultSoilMoistureService" android:enabled="true" @@ -56,6 +54,14 @@ android:name="com.crashlytics.ApiKey" android:value="cf760ececcb6d74c66781b3e21ae115aaae3ffd3"/> + <activity + android:name=".SensorActivity" + android:label="@string/title_activity_sensor" + android:parentActivityName=".MainActivity"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="io.trygvis.soilmoisture.MainActivity"/> + </activity> </application> </manifest> |