catch up with recent changes

This commit is contained in:
Eric House 2014-07-21 22:13:32 -07:00
parent a84194c180
commit 6ac5f2177f
2 changed files with 29 additions and 17 deletions

View file

@ -125,11 +125,6 @@
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden"
/> />
<activity android:name="LookupActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.Dialog"
/>
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -174,9 +169,11 @@
</activity> </activity>
<!-- downloading dicts --> <!-- downloading dicts -->
<activity android:name=".DictImportActivity" <activity android:name=".DwnldActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog"> android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"></action> <action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category> <category android:name="android.intent.category.DEFAULT"></category>
@ -190,7 +187,9 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="RelayGameActivity"/> <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"
/> />
@ -200,6 +199,9 @@
<activity android:name=".loc.LocActivity" <activity android:name=".loc.LocActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name=".loc.LocItemEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<service android:name="RelayService"/> <service android:name="RelayService"/>

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="76" android:versionCode="78"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
@ -123,11 +123,6 @@
android:configChanges="keyboardHidden" android:configChanges="keyboardHidden"
/> />
<activity android:name="LookupActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@android:style/Theme.Dialog"
/>
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
@ -172,9 +167,11 @@
</activity> </activity>
<!-- downloading dicts --> <!-- downloading dicts -->
<activity android:name=".DictImportActivity" <activity android:name=".DwnldActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog"> android:theme="@android:style/Theme.Dialog"
android:configChanges="keyboardHidden|orientation|screenSize"
>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"></action> <action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category> <category android:name="android.intent.category.DEFAULT"></category>
@ -188,7 +185,9 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="RelayGameActivity"/> <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"
/> />
@ -198,6 +197,9 @@
<activity android:name=".loc.LocActivity" <activity android:name=".loc.LocActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name=".loc.LocItemEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/>
<service android:name="RelayService"/> <service android:name="RelayService"/>
@ -216,6 +218,14 @@
<intent-filter android:priority="999" > <intent-filter android:priority="999" >
<action android:name="android.provider.Telephony.SMS_RECEIVED" /> <action android:name="android.provider.Telephony.SMS_RECEIVED" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.DATA_SMS_RECEIVED" />
<data android:scheme="sms" />
<data android:port="3344" />
<data android:host="*" />
</intent-filter>
</receiver> </receiver>
<service android:name="SMSService"/> <service android:name="SMSService"/>