catch up with non-dbg changes, esp. enabling dual-pane mode (though

it's off now thanks to a compile-time constant)
This commit is contained in:
Eric House 2016-04-18 06:21:49 -07:00
parent 406eb77f54
commit c9a1f00a43

View file

@ -6,7 +6,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="99" android:versionCode="100"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
@ -57,7 +57,7 @@
android:debuggable="true" android:debuggable="true"
> >
<activity android:name="GamesListActivity" <activity android:name="Main"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="standard" android:launchMode="standard"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
@ -72,25 +72,31 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="@string/xwords_nfc_mime" /> <data android:mimeType="@string/xwords_nfc_mime" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="FragActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="GamesListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<activity android:name="DictsActivity" <activity android:name="DictsActivity"
android:label="@string/title_dicts_list" android:label="@string/title_dicts_list"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="BTInviteActivity" <activity android:name="BTInviteActivity"
android:label="@string/bt_invite_title" android:label="@string/bt_invite_title"
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:label="@string/sms_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="sensor" android:screenOrientation="sensor"
/> />
<activity android:name="RelayInviteActivity" <activity android:name="RelayInviteActivity"
android:label="@string/relay_invite_title" android:label="@string/relay_invite_title"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -208,10 +214,10 @@
<receiver android:name="BTReceiver"> <receiver android:name="BTReceiver">
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.device.action.ACL_CONNECTED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter> </intent-filter>
</receiver> </receiver>