|
@@ -1,99 +1,106 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
- package="de.tudarmstadt.informatik.hostage"
|
|
|
- android:versionCode="1"
|
|
|
- android:versionName="1.0" >
|
|
|
+ package="de.tudarmstadt.informatik.hostage"
|
|
|
+ android:versionCode="1"
|
|
|
+ android:versionName="1.0">
|
|
|
|
|
|
- <uses-sdk
|
|
|
- android:minSdkVersion="14"
|
|
|
- android:targetSdkVersion="19" />
|
|
|
+ <uses-sdk
|
|
|
+ android:minSdkVersion="14"
|
|
|
+ android:targetSdkVersion="19"/>
|
|
|
|
|
|
- <uses-permission android:name="android.permission.VIBRATE" />
|
|
|
- <uses-permission android:name="android.permission.INTERNET" />
|
|
|
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
|
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
|
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
|
|
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
|
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
|
-
|
|
|
- <!-- Tell the system this app requires OpenGL ES 2.0. -->
|
|
|
- <uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
|
|
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
|
- <uses-permission android:name="android.permission.BLUETOOTH" />
|
|
|
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
|
|
- <uses-permission android:name="android.permission.NFC" />
|
|
|
+ <uses-permission android:name="android.permission.VIBRATE"/>
|
|
|
+ <uses-permission android:name="android.permission.INTERNET"/>
|
|
|
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
|
|
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
|
|
|
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
|
|
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
|
|
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
|
|
+ <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
|
|
|
|
|
|
- <uses-feature
|
|
|
- android:name="android.hardware.nfc"
|
|
|
- android:required="false" />
|
|
|
+ <!-- Tell the system this app requires OpenGL ES 2.0. -->
|
|
|
+ <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
|
|
|
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
|
|
|
+ <uses-permission android:name="android.permission.BLUETOOTH"/>
|
|
|
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
|
|
+ <uses-permission android:name="android.permission.NFC"/>
|
|
|
|
|
|
- <application
|
|
|
- android:allowBackup="true"
|
|
|
- android:icon="@drawable/ic_launcher"
|
|
|
- android:label="@string/app_name"
|
|
|
- android:theme="@style/AppTheme"
|
|
|
- android:debuggable="true"
|
|
|
- android:installLocation="preferExternal">
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
|
|
|
- android:configChanges="keyboardHidden|orientation|screenSize"
|
|
|
- android:label="@string/app_name"
|
|
|
- android:screenOrientation="portrait" >
|
|
|
- <intent-filter>
|
|
|
- <action android:name="android.intent.action.MAIN" />
|
|
|
+ <uses-feature
|
|
|
+ android:name="android.hardware.nfc"
|
|
|
+ android:required="false"/>
|
|
|
|
|
|
- <category android:name="android.intent.category.LAUNCHER" />
|
|
|
- </intent-filter>
|
|
|
- </activity>
|
|
|
- <!--
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
|
|
|
- android:configChanges="keyboardHidden|orientation|screenSize"
|
|
|
- android:label="@string/app_name" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
|
|
|
- android:label="@string/statistics" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.ViewLogTable"
|
|
|
- android:label="@string/database" >
|
|
|
- </activity>
|
|
|
- -->
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui2.preference.ProfileEditActivity"
|
|
|
- android:label="Edit Profile" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.SettingsActivity"
|
|
|
- android:label="@string/settings" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.AboutActivity"
|
|
|
- android:label="@string/gui_action_about" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.ui.PlayGroundActivity"
|
|
|
- android:label="@string/gui_playground" >
|
|
|
- </activity>
|
|
|
- <activity
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.sync.NFCSync"
|
|
|
- android:label="@string/gui_playground" >
|
|
|
- <intent-filter>
|
|
|
- <action android:name="android.nfc.action.NDEF_DISCOVERED" />
|
|
|
+ <application
|
|
|
+ android:allowBackup="true"
|
|
|
+ android:icon="@drawable/ic_launcher"
|
|
|
+ android:label="@string/app_name"
|
|
|
+ android:theme="@style/AppTheme"
|
|
|
+ android:debuggable="true"
|
|
|
+ android:installLocation="preferExternal">
|
|
|
+ <meta-data
|
|
|
+ android:name="com.google.android.gms.version"
|
|
|
+ android:value="14"/>
|
|
|
+ <meta-data
|
|
|
+ android:name="com.google.android.maps.v2.API_KEY"
|
|
|
+ android:value="AIzaSyB7kAfeQSEirb0mZ9xeA4IewRzf8xKqjic"/>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
|
|
|
+ android:configChanges="keyboardHidden|orientation|screenSize"
|
|
|
+ android:label="@string/app_name"
|
|
|
+ android:screenOrientation="portrait">
|
|
|
+ <intent-filter>
|
|
|
+ <action android:name="android.intent.action.MAIN"/>
|
|
|
|
|
|
- <category android:name="android.intent.category.DEFAULT" />
|
|
|
+ <category android:name="android.intent.category.LAUNCHER"/>
|
|
|
+ </intent-filter>
|
|
|
+ </activity>
|
|
|
+ <!--
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
|
|
|
+ android:configChanges="keyboardHidden|orientation|screenSize"
|
|
|
+ android:label="@string/app_name" >
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.ViewLog"
|
|
|
+ android:label="@string/statistics" >
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.ViewLogTable"
|
|
|
+ android:label="@string/database" >
|
|
|
+ </activity>
|
|
|
+ -->
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui2.preference.ProfileEditActivity"
|
|
|
+ android:label="Edit Profile">
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.SettingsActivity"
|
|
|
+ android:label="@string/settings">
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.AboutActivity"
|
|
|
+ android:label="@string/gui_action_about">
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.ui.PlayGroundActivity"
|
|
|
+ android:label="@string/gui_playground">
|
|
|
+ </activity>
|
|
|
+ <activity
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.sync.NFCSync"
|
|
|
+ android:label="@string/gui_playground">
|
|
|
+ <intent-filter>
|
|
|
+ <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
|
|
|
|
|
|
- <data android:mimeType="application/de.tudarmstadt.informatik.hostage" />
|
|
|
- </intent-filter>
|
|
|
- </activity>
|
|
|
+ <category android:name="android.intent.category.DEFAULT"/>
|
|
|
|
|
|
- <service android:name="de.tudarmstadt.informatik.hostage.HoneyService" >
|
|
|
- </service>
|
|
|
- <service
|
|
|
- android:name="de.tudarmstadt.informatik.hostage.logging.Logger"
|
|
|
- android:exported="false" >
|
|
|
- </service>
|
|
|
- </application>
|
|
|
+ <data android:mimeType="application/de.tudarmstadt.informatik.hostage"/>
|
|
|
+ </intent-filter>
|
|
|
+ </activity>
|
|
|
+
|
|
|
+ <service android:name="de.tudarmstadt.informatik.hostage.HoneyService">
|
|
|
+ </service>
|
|
|
+ <service
|
|
|
+ android:name="de.tudarmstadt.informatik.hostage.logging.Logger"
|
|
|
+ android:exported="false">
|
|
|
+ </service>
|
|
|
+ </application>
|
|
|
|
|
|
</manifest>
|