|
@@ -38,10 +38,10 @@
|
|
android:vmSafeMode="true" >
|
|
android:vmSafeMode="true" >
|
|
<meta-data
|
|
<meta-data
|
|
android:name="com.google.android.gms.version"
|
|
android:name="com.google.android.gms.version"
|
|
- android:value="14" />
|
|
+ android:value="@integer/google_play_services_lib_version" />
|
|
<meta-data
|
|
<meta-data
|
|
android:name="com.google.android.maps.v2.API_KEY"
|
|
android:name="com.google.android.maps.v2.API_KEY"
|
|
- android:value="AIzaSyCqh4bb4aMzvDcpDfiqHyXoAWFTQ6iNxe8" />
|
|
+ android:value="@string/google_maps_api_key_debug" />
|
|
|
|
|
|
<activity
|
|
<activity
|
|
android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
|
|
android:name="de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity"
|
|
@@ -54,6 +54,7 @@
|
|
</intent-filter>
|
|
</intent-filter>
|
|
|
|
|
|
</activity>
|
|
</activity>
|
|
|
|
+
|
|
<activity
|
|
<activity
|
|
android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
|
|
android:name="de.tudarmstadt.informatik.hostage.ui.MainActivity"
|
|
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
android:configChanges="keyboardHidden|orientation|screenSize"
|
|
@@ -85,6 +86,7 @@
|
|
android:name="de.tudarmstadt.informatik.hostage.ui.PlayGroundActivity"
|
|
android:name="de.tudarmstadt.informatik.hostage.ui.PlayGroundActivity"
|
|
android:label="@string/gui_playground" >
|
|
android:label="@string/gui_playground" >
|
|
</activity>
|
|
</activity>
|
|
|
|
+
|
|
<activity
|
|
<activity
|
|
android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity"
|
|
android:name="de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity"
|
|
android:label="@string/gui_tracing"
|
|
android:label="@string/gui_tracing"
|