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' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch

Browse source 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
This commit is contained in:
Eric House 2011-02-26 20:02:29 -08:00
commit 4d5aad61b4
6 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,6 @@
<activity android:name="GamesList"
android:label="@string/title_games_list"
android:launchMode="singleTask"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -83,7 +82,6 @@
android:theme="@android:style/Theme.Light"
android:screenOrientation="sensor"
android:configChanges="keyboardHidden|orientation"
android:launchMode="singleTask"
>
</activity>

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

@ -53,7 +53,7 @@ public class DispatchNotify extends Activity {
if ( !tryHandle( this, relayIDs ) ) {
Utils.logf( "DispatchNotify: nothing running" );
intent = new Intent( this, GamesList.class );
// intent.setFlags( Intent.FLAG_ACTIVITY_SINGLE_TOP );
intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
intent.putExtra( id, relayIDs );
startActivity( intent );
}

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

@ -115,12 +115,10 @@ public class DlgDelegate {
{
boolean set = CommonPrefs.getPrefsBoolean( m_activity, prefsKey, false );
if ( set ) {
Utils.logf( "showNotAgainDlgThen: skipping message" );
if ( null != proc ) {
proc.run();
}
} else {
Utils.logf( "showNotAgainDlgThen: setting message: %d", msgID );
m_msgID = msgID;
m_proc = proc;
m_prefsKey = prefsKey;

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

@ -71,7 +71,6 @@ public class RelayService extends Service {
private void setupNotification( String[] relayIDs )
{
Intent intent = new Intent( this, DispatchNotify.class );
//intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
intent.putExtra( getString(R.string.relayids_extra),
relayIDs );

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
View file

@ -40,6 +40,7 @@ public class XWActivity extends Activity {
protected void onCreate( Bundle savedInstanceState )
{
Utils.logf( "%s.onCreate()", getClass().getName() );
super.onCreate( savedInstanceState );
m_delegate = new DlgDelegate( this );
}
@ -47,6 +48,7 @@ public class XWActivity extends Activity {
@Override
protected void onStart()
{
Utils.logf( "%s.onStart()", getClass().getName() );
super.onStart();
DispatchNotify.SetRunning( this );
}
@ -54,8 +56,16 @@ public class XWActivity extends Activity {
@Override
protected void onStop()
{
super.onStop();
Utils.logf( "%s.onStop()", getClass().getName() );
DispatchNotify.ClearRunning( this );
super.onStop();
}
@Override
protected void onDestroy()
{
Utils.logf( "%s.onDestroy()", getClass().getName() );
super.onDestroy();
}
@Override

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
View file

@ -33,6 +33,7 @@ public class XWListActivity extends ListActivity {
@Override
protected void onCreate( Bundle savedInstanceState )
{
Utils.logf( "%s.onCreate()", getClass().getName() );
super.onCreate( savedInstanceState );
m_delegate = new DlgDelegate( this );
}
@ -40,7 +41,7 @@ public class XWListActivity extends ListActivity {
@Override
protected void onStart()
{
Utils.logf( "XWListActivity::onStart" );
Utils.logf( "%s.onStart", getClass().getName() );
super.onStart();
DispatchNotify.SetRunning( this );
}
@ -48,11 +49,18 @@ public class XWListActivity extends ListActivity {
@Override
protected void onStop()
{
Utils.logf( "XWListActivity::onStop" );
Utils.logf( "%s.onStop", getClass().getName() );
DispatchNotify.ClearRunning( this );
super.onStop();
}
@Override
protected void onDestroy()
{
Utils.logf( "%s.onDestroy", getClass().getName() );
super.onDestroy();
}
@Override
protected Dialog onCreateDialog( final int id )
{