Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents

Conflicts:
	mobile/res/values/strings.xml
This commit is contained in:
Philipp Schaefer
2013-07-27 11:23:51 +02:00
24 changed files with 547 additions and 29 deletions

View File

@ -50,22 +50,58 @@
<data
android:host="www.ingress.com"
android:scheme="https"
android:pathPrefix="/intel"></data>
android:pathPrefix="/intel"/>
<data
android:host="www.ingress.com"
android:scheme="http"
android:pathPrefix="/intel"></data>
android:pathPrefix="/intel"/>
</intent-filter>
<!-- Handles geo: URIs -->
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="geo"/>
</intent-filter>
<!-- Points to searchable meta data. -->
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity
android:name="com.cradle.iitc_mobile.IITC_Settings"
android:theme="@style/AppBaseTheme"
android:label="@string/app_name"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
android:configChanges="orientation|keyboard|keyboardHidden|screenSize"/>
<activity
android:name=".share.ShareActivity"
android:label="@string/app_name"
android:noHistory="true"
android:parentActivityName="com.cradle.iitc_mobile.IITC_Mobile"
android:theme="@android:style/Theme.Holo.Light.DarkActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.cradle.iitc_mobile.IITC_Mobile"/>
</activity>
<activity
android:name=".share.SendToClipboard"
android:enabled="true"
android:excludeFromRecents="true"
android:exported="false"
android:label="Copy to clipboard"
android:noHistory="false">
<intent-filter>
<action android:name="android.intent.action.SEND"/>
<data android:mimeType="text/plain"/>
</intent-filter>
</activity>
<!-- START Used for Samsung Multi-Window support -->
@ -76,7 +112,6 @@
<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"/>