gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2.0.x' =x V2.0.6

Browse Source
This commit is contained in:
Graham Jones
2016-08-08 18:11:47 +01:00
parent 6d8085dbe0 256280ac0b
commit 19a6b912a8
37 changed files with 1793 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/AndroidManifest.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="24"
android:versionName="2.0.3a" >
android:versionCode="27"
android:versionName="2.0.6">
<uses-sdk android:minSdkVersion="14" />
<uses-sdk android:minSdkVersion="14" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -23,30 +23,28 @@
<application
android:icon="@drawable/star_of_life_48x48"
android:label="@string/app_name" >
<activity android:name=".StartupActivity" >
android:label="@string/app_name">
<activity android:name=".StartupActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".MainActivity"
android:icon="@drawable/star_of_life_48x48"
android:label="@string/app_name"
android:exported="true"
>
</activity>
android:icon="@drawable/star_of_life_48x48"
android:label="@string/app_name"></activity>
<activity
android:name=".PrefActivity"
android:label="OpenSeizureDetector Preferences" >
</activity>
android:label="OpenSeizureDetector Preferences"></activity>
<service
android:name=".SdServer"
android:exported="false" />
<activity android:name=".LogManagerActivity"></activity>
</application>
</manifest> <!-- android:uiOptions="splitActionBarWhenNarrow" -->