From c4685214d8db34166213ffa373a16af1a99401a5 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 27 Jan 2015 21:23:50 +0100
Subject: 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.

---
 app/src/main/AndroidManifest.xml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

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>
-- 
cgit v1.2.3