Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-01 06:19:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'sf/android_branch' into android_multi2

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-02-24 06:46:16 -08:00
commit da3452f3fa
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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.xw4"
android:versionCode="86"
android:versionCode="87"
android:versionName="@string/app_version"
>

5
xwords4/android/XWords4/assets/changes.html
View file

@ -13,7 +13,7 @@
</style>
</head>
<body>
<h2>Crosswords 4.4 beta 93 release</h2>
<h2>Crosswords 4.4 beta 94 release</h2>
<p>This is an interim release making low-level network changes that
need to be out there before the next, more ambitious set of changes
@ -29,10 +29,11 @@
<h3>New with this release</h3>
<ul>
<li>Change &quot;protocol&quot; of messages passed between games
to include more information.</li>
to include more information</li>
<li>Replace "Do not show again" button in new-player hint
dialogs with a checkbox</li>
<li>Resend pending messages every time game is opened</li>
<li>Fix crash downloading wordlists</li>
</ul>
<p>(The full changelog

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

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

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
View file

@ -273,6 +273,7 @@ public class DwnldDelegate extends ListDelegateBase {
|| uri.toString().endsWith( XWConstants.DICT_EXTN ) ) {
item = (LinearLayout)inflate( R.layout.import_dict_item );
dft = new DownloadFilesTask( uri, item, false );
uris = new Uri[] { uri };
}
if ( null != dft ) {