merge recent manifest changes

This commit is contained in:
Eric House 2016-11-30 06:58:56 -08:00
parent a3bc4f0a75
commit a686541f96
2 changed files with 5 additions and 6 deletions

View file

@ -6,7 +6,7 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4dbg"
android:versionCode="107"
android:versionCode="109"
android:versionName="@string/app_version"
>
@ -99,6 +99,7 @@
android:label="@string/p2p_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="GameConfigActivity"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize"

View file

@ -57,7 +57,7 @@
android:name=".XWApp"
>
<activity android:name="MainActivity"
<activity android:name="MainActivity"
android:label="@string/app_name"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation|screenSize"
@ -197,6 +197,8 @@
/>
<service android:name="RelayService"/>
<service android:name="BTService"/>
<service android:name="SMSService"/>
<receiver android:name=".MountEventReceiver">
<intent-filter>
@ -218,8 +220,6 @@
</intent-filter>
</receiver>
<service android:name="BTService"/>
<receiver android:name="SMSReceiver" >
<intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" />
@ -230,8 +230,6 @@
</receiver>
<service android:name="SMSService"/>
<receiver android:name="com.google.android.gcm.GCMBroadcastReceiver"
android:permission="com.google.android.c2dm.permission.SEND" >
<intent-filter>