sync variants' AndroidManifest.xml files

This commit is contained in:
Eric House 2017-08-26 11:02:27 -07:00
parent 24a38c8f46
commit ff415640fd
2 changed files with 5 additions and 23 deletions

View file

@ -6,8 +6,6 @@
<!-- BE SURE TO MODIFY project.properties AND the variable TARGET in <!-- BE SURE TO MODIFY project.properties AND the variable TARGET in
../scripts/setup_local_props.sh if targetSdkVersion changes!!! ../scripts/setup_local_props.sh if targetSdkVersion changes!!!
--> -->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="23" />
<supports-screens android:resizeable="true" <supports-screens android:resizeable="true"
android:smallScreens="true" android:smallScreens="true"
android:normalScreens="true" android:normalScreens="true"

View file

@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Declare the contents of this Android application. The namespace
attribute brings in the Android platform namespace, and the package
supplies a unique name for the application. When writing your
own application, the package name must be changed from "com.example.*"
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.xw4" package="org.eehouse.android.xw4"
> >
@ -76,32 +70,30 @@
<!-- NOT in the non-d version --> <!-- NOT in the non-d version -->
<meta-data android:name="io.fabric.ApiKey" android:value="${FABRIC_API_KEY}" /> <meta-data android:name="io.fabric.ApiKey" android:value="${FABRIC_API_KEY}" />
<activity android:name="HostActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
/>
<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"
/> />
<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"
/> />
<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: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"
/> />
<activity android:name="WiDirInviteActivity" <activity android:name="WiDirInviteActivity"
android:label="@string/p2p_invite_title" android:label="@string/p2p_invite_title"
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:windowSoftInputMode="stateAlwaysHidden" android:windowSoftInputMode="stateAlwaysHidden"
> >
<intent-filter> <intent-filter>
@ -112,17 +104,14 @@
<activity android:name="PrefsActivity" <activity android:name="PrefsActivity"
android:label="@string/title_prefs" android:label="@string/title_prefs"
android:screenOrientation="sensor" android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="BoardActivity" <activity android:name="BoardActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:configChanges="keyboardHidden|orientation|screenSize"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
/> />
<activity android:name="StudyListActivity" <activity android:name="StudyListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<receiver android:name="OnBootReceiver"> <receiver android:name="OnBootReceiver">
@ -132,6 +121,7 @@
</receiver> </receiver>
<receiver android:name="RelayReceiver"/> <receiver android:name="RelayReceiver"/>
<receiver android:name="NagTurnReceiver"/> <receiver android:name="NagTurnReceiver"/>
<receiver android:name="SMSResendReceiver"/>
<receiver android:name="UpdateCheckReceiver"> <receiver android:name="UpdateCheckReceiver">
<intent-filter> <intent-filter>
@ -170,7 +160,6 @@
<activity android:name=".DwnldActivity" <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>
@ -186,16 +175,12 @@
</activity> </activity>
<activity android:name="DictBrowseActivity" <activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name="ChatActivity" <activity android:name="ChatActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name=".loc.LocActivity" <activity android:name=".loc.LocActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<activity android:name=".loc.LocItemEditActivity" <activity android:name=".loc.LocItemEditActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
/> />
<service android:name="RelayService"/> <service android:name="RelayService"/>
@ -230,7 +215,6 @@
<data android:port="@string/nbs_port" /> <data android:port="@string/nbs_port" />
<data android:host="*" /> <data android:host="*" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver"