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

Merge branch 'from_beta_60' into android_branch

Browse source 
Conflicts:
	xwords4/android/XWords4/AndroidManifest.xml
	xwords4/android/XWords4/project.properties
	xwords4/android/XWords4/res/raw/changes
This commit is contained in:
Eric House 2013-06-25 21:25:03 -07:00
commit 79293503fd
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -22,12 +22,19 @@
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.xw4" package="org.eehouse.android.xw4"
android:versionCode="53" android:versionCode="54"
android:versionName="@string/app_version" android:versionName="@string/app_version"
> >
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="11" /> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="11" />
<supports-screens android:resizeable="true"
android:smallScreens="true"
android:normalScreens="true"
android:largeScreens="true"
android:xlargeScreens="true"
/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@ -38,6 +45,19 @@
<uses-permission android:name="android.permission.READ_SMS" /> <uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-feature android:name="android.permission.VIBRATE"
android:required = "false"
/>
<uses-feature android:name="android.permission.RECEIVE_SMS"
android:required = "false"
/>
<uses-feature android:name="android.permission.SEND_SMS"
android:required = "false"
/>
<uses-feature android:name="android.permission.READ_SMS"
android:required = "false"
/>
<!-- GCM stuff --> <!-- GCM stuff -->
<permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE" <permission android:name="org.eehouse.android.xw4.permission.C2D_MESSAGE"
android:protectionLevel="signature" /> android:protectionLevel="signature" />

2
xwords4/android/XWords4/res/raw/changes
View file

@ -5,7 +5,7 @@
</style> </style>
</head> </head>
<body> <body>
<b>Crosswords 4.4 beta 61 release</b> <b>Crosswords 4.4 beta 62 release</b>
<h3>New with this release</h3> <h3>New with this release</h3>
<ul> <ul>

2
xwords4/android/XWords4/res/values/app_name.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_version">4.4 beta 61</string> <string name="app_version">4.4 beta 62</string>
</resources> </resources>