diff options
Diffstat (limited to 'main/AndroidManifest.xml')
| -rw-r--r-- | main/AndroidManifest.xml | 66 |
1 files changed, 47 insertions, 19 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 7836d07..fe86b15 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -7,13 +7,14 @@ <uses-sdk android:minSdkVersion="9" - android:targetSdkVersion="9" /> + android:targetSdkVersion="19" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <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" @@ -40,20 +44,6 @@ android:name="com.google.android.maps" android:required="false" /> - <!-- Samsung Multi-Window support --> - <uses-library - android:name="com.sec.android.app.multiwindow" - android:required="false" /> - - <meta-data - android:name="com.sec.android.support.multiwindow" - android:value="true" /> - <meta-data - android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" - android:resource="@dimen/app_defaultsize_w" /> - <meta-data - android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" - android:resource="@dimen/app_defaultsize_h" /> <meta-data android:name="android.app.default_searchable" android:value=".SearchActivity" /> @@ -79,12 +69,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 +93,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 +136,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 +438,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 +485,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" /> @@ -472,6 +494,12 @@ </intent-filter> </activity> + <activity android:name=".activity.SimpleWebviewActivity" + android:label="c:geo internal browser" + android:icon="@drawable/ic_launcher_browser"> + + </activity> + <!-- provide enhanced meta data for caches (and waypoints) when invoking Locus from c:geo --> <provider android:name=".apps.LocusDataStorageProvider" |