Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-10 05:26:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge in a year's worth of changes

Browse source
This commit is contained in:
Eric House 2015-07-25 08:45:28 -07:00
parent 48e019f216
commit d67245282b
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/android/XWords4-dbg/AndroidManifest.xml
View file

@ -22,7 +22,7 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4dbg" package="org.eehouse.android.xw4dbg"
android:versionCode="78" android:versionCode="90"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
@ -45,8 +45,10 @@
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_SMS" /> <uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.READ_SMS" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-feature android:name="android.hardware.telephony" <uses-feature android:name="android.hardware.telephony"
android:required = "false" android:required = "false"
@ -93,19 +95,27 @@
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="NewGameActivity" <activity android:name="BTInviteActivity"
android:theme="@android:style/Theme.NoTitleBar" android:label="@string/bt_invite_title"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="SMSInviteActivity" <activity android:name="SMSInviteActivity"
android:label="@string/sms_invite_title"
android:theme="@android:style/Theme.Dialog" android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="sensor" android:screenOrientation="sensor"
/> />
<activity android:name="RelayInviteActivity"
android:label="@string/relay_invite_title"
android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="GameConfigActivity" <activity android:name="GameConfigActivity"
android:screenOrientation="sensor" android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.EDIT" /> <action android:name="android.intent.action.EDIT" />
@ -120,7 +130,8 @@
<activity android:name="BoardActivity" <activity android:name="BoardActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
/> />
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
@ -187,9 +198,6 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="RelayGameActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="DictBrowseActivity" <activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -216,15 +224,22 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="SMSReceiver" > <receiver android:name="BTReceiver">
<intent-filter android:priority="999" > <intent-filter>
<action android:name="android.provider.Telephony.SMS_RECEIVED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
</intent-filter>
</receiver>
<service android:name="BTService"/>
<receiver android:name="SMSReceiver" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" /> <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
<data android:scheme="sms" /> <data android:scheme="sms" />
<data android:port="3344" /> <data android:port="@string/nbs_port" />
<data android:host="*" /> <data android:host="*" />
</intent-filter> </intent-filter>