Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'android_branch' into send_in_background

Browse source
This commit is contained in:
Eric House 2011-12-19 18:48:49 -08:00
commit 559b6761ef
5 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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="31"
android:versionCode="32"
android:versionName="@string/app_version"
>
@ -43,7 +43,7 @@
<activity android:name="GamesList"
android:label="@string/title_games_list"
android:launchMode="singleTop"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation"
>
<intent-filter>

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

@ -6,27 +6,13 @@
</head>
<body>
<b>Crosswords 4.4 beta 39 release</b>
<b>Crosswords 4.4 beta 40 release</b>
<ul>
<li>Offer choice between SMS and email for sending invitations</li>
<li>Add "email author" menuitem to Games List screen. Please
do!</li>
<li>Enable pinch-to-zoom for board</li>
<li>Improve handling of invitations and move notifications received</li>
<li>Improve wordlist browser to filter by size, have larger
text, and not barf when given empty wordlist</li>
<li>Add value/letter toggle button since space isn't so precious
now (and remove menuitem)</li>
<li>Add Setting checkbox to disable crosshairs</li>
<li>Replace Restore menus in Settings with buttons</li>
<li>Fix problem with text color in word lookup dialog on HTC
MyTouch</li>
<li>Make undo button easier to get to</li>
</ul>
<p>Please remember that this is beta software. Please let me know (at

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

@ -3,7 +3,7 @@
<!-- Resources in this file do not require localization -->
<resources>
<string name="app_version">4.4 beta 39</string>
<string name="app_version">4.4 beta 40</string>
<!-- prefs keys -->
<string name="key_color_tiles">key_color_tiles</string>

9
xwords4/android/XWords4/res/values/strings.xml
View file

@ -525,8 +525,7 @@
<string name="button_trade_commit">Commit exchange</string>
<string name="button_trade_cancel">Cancel exchange</string>
<string name="entering_trade">Tap to select tiles...</string>
<string name="entering_trade">Tap tiles to select...</string>
<!-- Bonus value hint that's displayed in gray text in the colored
@ -1199,9 +1198,9 @@
<!-- This is the body of the text version of the invitation. A URL
is created with parameters describing the game and
substituted for "%1$s".-->
<string name="invite_txtf">Play Crosswords? Join this
game: %1$s . (But install Crosswords first if you haven\'t:
http://eehouse.org/market_redir.php ).</string>
<string name="invite_txtf">Play Crosswords? Join this game: %1$s
. (But install Crosswords http://eehouse.org/market_redir.php
first if you haven\'t.)</string>
<!-- When I've created the invitation, in text or html, I ask
Android to launch an app that can send it, typically an email

25
xwords4/android/XWords4/src/org/eehouse/android/xw4/DispatchNotify.java
View file

@ -67,22 +67,19 @@ public class DispatchNotify extends Activity {
DbgUtils.logf( "DispatchNotify: nothing running" );
Intent intent = new Intent( this, GamesList.class );
/* Flags. Tried Intent.FLAG_ACTIVITY_NEW_TASK. I don't
* remember what it fixes, but what it breaks is easy to
* duplicate. Launch Crosswords from the home screen making
* sure it's the only instance running. Get a networked game
* going, and with BoardActivity frontmost check the relay and
* select a relay notification. New BoardActivity will come
* up, but if you hit home button then Crosswords icon you're
* back to games list. Hit back button and you're back to
* BoardActivity, and back from there back to GamesList.
* That's because a new activity came up from the activity
* below thanks to the flag.
*/
// This combination of flags will bring an existing
// GamesList instance to the front, killing any children
// it has, or create a new one if none exists. Coupled
// with a "standard" launchMode it seems to work, meaning
// both that the app preserves its stack in normal use
// (you can go to Home with a stack of activities and
// return to the top activity on that stack if you
// relaunch the app) and that when I launch from here the
// stack gets nuked and we don't get a second GamesList
// instance.
intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP
// Intent.FLAG_ACTIVITY_NEW_TASK NO See above
);
| Intent.FLAG_ACTIVITY_NEW_TASK );
if ( null != relayIDs ) {
intent.putExtra( RELAYIDS_EXTRA, relayIDs );
} else if ( null != data ) {