From d67245282b44522494b8058e777f69a6700d03b5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 25 Jul 2015 08:45:28 -0700
Subject: [PATCH] merge in a year's worth of changes

---
 .../android/XWords4-dbg/AndroidManifest.xml   | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/AndroidManifest.xml b/xwords4/android/XWords4-dbg/AndroidManifest.xml
index 6738f6632..43170286e 100644
--- a/xwords4/android/XWords4-dbg/AndroidManifest.xml
+++ b/xwords4/android/XWords4-dbg/AndroidManifest.xml
@@ -22,7 +22,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="78"
+          android:versionCode="90"
           android:versionName="@string/app_version"
           >
 
@@ -45,8 +45,10 @@
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.RECEIVE_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_PHONE_STATE"/> 
 
   <uses-feature android:name="android.hardware.telephony"
                 android:required = "false"
@@ -93,19 +95,27 @@
               android:configChanges="keyboardHidden|orientation|screenSize"
           />
     
-    <activity android:name="NewGameActivity"
-              android:theme="@android:style/Theme.NoTitleBar"
+    <activity android:name="BTInviteActivity"
+			  android:label="@string/bt_invite_title"
+              android:theme="@android:style/Theme.Dialog"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
     <activity android:name="SMSInviteActivity"
+			  android:label="@string/sms_invite_title"
               android:theme="@android:style/Theme.Dialog"
               android:configChanges="keyboardHidden|orientation|screenSize"
               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"
               android:screenOrientation="sensor"
               android:configChanges="keyboardHidden|orientation|screenSize"
+              android:windowSoftInputMode="stateAlwaysHidden"
               >
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
@@ -120,7 +130,8 @@
 
     <activity android:name="BoardActivity"
               android:screenOrientation="portrait"
-              android:configChanges="keyboardHidden"
+              android:configChanges="keyboardHidden|orientation|screenSize"
+              android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
               />
 
     <activity android:name="StudyListActivity"
@@ -187,9 +198,6 @@
       </intent-filter> 
     </activity>
 
-    <activity android:name="RelayGameActivity"
-              android:configChanges="keyboardHidden|orientation|screenSize"
-              />
     <activity android:name="DictBrowseActivity"
               android:configChanges="keyboardHidden|orientation|screenSize"
               />
@@ -216,15 +224,22 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name="SMSReceiver" >
-      <intent-filter android:priority="999" >
-        <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+    <receiver android:name="BTReceiver">
+      <intent-filter>
+        <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
       </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>
         <action android:name="android.intent.action.DATA_SMS_RECEIVED" /> 
         <data android:scheme="sms" /> 
-        <data android:port="3344" /> 
+        <data android:port="@string/nbs_port" /> 
         <data android:host="*" /> 
       </intent-filter>