1 files changed, 40 insertions, 4 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 14395ec..0268762 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.NFC" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -21,6 +22,9 @@
     <uses-feature
         android:name="android.hardware.screen.portrait"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.nfc"
+        android:required="false" />
 
     <supports-screens
         android:anyDensity="true"
@@ -79,12 +83,16 @@
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/app_name"
             android:launchMode="singleTop"
+            android:parentActivityName="cgeo.geocaching.MainActivity"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
             <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
+            <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
@@ -99,13 +107,21 @@
             android:name=".AboutActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/about"
+            android:parentActivityName="cgeo.geocaching.MainActivity"
             android:windowSoftInputMode="stateHidden" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
         </activity>
         <activity
             android:name=".UsefulAppsActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/helpers"
+            android:parentActivityName="cgeo.geocaching.MainActivity"
             android:windowSoftInputMode="stateHidden" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
         </activity>
         <activity
             android:name=".twitter.TwitterAuthorizationActivity"
@@ -134,24 +150,40 @@
             android:name=".NavigateAnyPointActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/search_destination"
+            android:parentActivityName="cgeo.geocaching.MainActivity"
             android:windowSoftInputMode="stateHidden" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
         </activity>
         <activity
             android:name=".AddressListActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/search_address_result"
+            android:parentActivityName="cgeo.geocaching.SearchActivity"
             android:windowSoftInputMode="stateHidden" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.SearchActivity" />
         </activity>
         <activity
             android:name=".settings.SettingsActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/settings_titlebar"
+            android:parentActivityName="cgeo.geocaching.MainActivity"
             android:theme="@style/settings" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
         </activity>
         <activity
             android:name=".CacheListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:parentActivityName="cgeo.geocaching.MainActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.MainActivity" />
 
             <!-- intent filter for local gpx files -->
             <intent-filter>
@@ -420,9 +452,12 @@
         <activity
             android:name=".SelectMapfileActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="@string/map_file_select_title" >
+            android:label="@string/map_file_select_title"
+            android:parentActivityName="cgeo.geocaching.settings.SettingsActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="cgeo.geocaching.settings.SettingsActivity" />
         </activity>
-
         <activity
             android:name="WaypointPopup"
             android:configChanges="keyboardHidden|orientation"
@@ -464,7 +499,8 @@
         </activity>
         <activity
             android:name=".CreateShortcutActivity"
-            android:label="@string/cgeo_shortcut" >
+            android:label="@string/cgeo_shortcut"
+            android:parentActivityName="cgeo.geocaching.MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />