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

Merge branch 'android_branch' into android_invite

Browse source
This commit is contained in:
eehouse@eehouse.org 2011-07-20 18:26:16 -07:00 committed by Andy2
commit 904c95af12
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,8 +66,23 @@ public class DispatchNotify extends Activity {
if ( mustLaunch ) {
Utils.logf( "DispatchNotify: launching GamesList activity" );
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.
*/
intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP
| Intent.FLAG_ACTIVITY_NEW_TASK );
// Intent.FLAG_ACTIVITY_NEW_TASK NO See above
);
if ( null != relayIDs ) {
intent.putExtra( RELAYIDS_EXTRA, relayIDs );
} else if ( null != data ) {

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
View file

@ -39,7 +39,6 @@ public class PrefsActivity extends PreferenceActivity
private static final int REVERT_COLORS = 1;
private static final int REVERT_ALL = 2;
private String m_keyEmpty;
private String m_keyLogging;
@Override
@ -113,7 +112,6 @@ public class PrefsActivity extends PreferenceActivity
// Load the preferences from an XML resource
addPreferencesFromResource( R.xml.xwprefs );
m_keyEmpty = getString( R.string.key_empty );
m_keyLogging = getString( R.string.key_logging_on );
}