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

rename GamesListActivity -> MainActivity

Browse source
This commit is contained in:
Eric House 2016-07-10 13:09:20 -07:00
parent c3817ef452
commit 12b1f3e38b
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@
android:debuggable="false"
>
<activity android:name="GamesListActivity"
<activity android:name="MainActivity"
android:label="@string/app_name"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation|screenSize"

2
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore vendored
View file

@ -86,7 +86,6 @@ XWSumListPreference.java
XWThumbListPreference.java
DelegateBase.java
DlgID.java
GamesListActivity.java
GamesListDelegate.java
LookupAlert.java
BoardDelegate.java
@ -137,3 +136,4 @@ StudyListFrag.java
XWFragment.java
ConfirmingCheckBoxPreference.java
RelayCheckBoxPreference.java
MainActivity.java

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

@ -69,7 +69,7 @@
android:name=".XWApp"
>
<activity android:name="GamesListActivity"
<activity android:name="MainActivity"
android:label="@string/app_name"
android:launchMode="standard"
android:configChanges="keyboardHidden|orientation|screenSize"

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -2488,13 +2488,13 @@ public class GamesListDelegate extends ListDelegateBase
public static void onGameDictDownload( Context context, Intent intent )
{
intent.setClass( context, GamesListActivity.class );
intent.setClass( context, MainActivity.class );
context.startActivity( intent );
}
private static Intent makeSelfIntent( Context context )
{
Intent intent = new Intent( context, GamesListActivity.class );
Intent intent = new Intent( context, MainActivity.class );
intent.setFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP
| Intent.FLAG_ACTIVITY_NEW_TASK );
return intent;

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java → xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java
View file

@ -29,7 +29,7 @@ import org.eehouse.android.xw4.jni.CurGameInfo;
import junit.framework.Assert;
public class GamesListActivity extends XWActivity {
public class MainActivity extends XWActivity {
private GamesListDelegate m_dlgt;
@Override
@ -42,7 +42,7 @@ public class GamesListActivity extends XWActivity {
// once. finish()ing when Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT is
// passed is not the fix, but perhaps there's another
// int flags = getIntent().getFlags();
// DbgUtils.logf( "GamesListActivity.onCreate(this=%H): flags=0x%x",
// DbgUtils.logf( "MainActivity.onCreate(this=%H): flags=0x%x",
// this, flags );
} // onCreate

2
xwords4/android/scripts/adb-install.sh
View file

@ -16,7 +16,7 @@ APKS=''
DEVICES=''
DIRNAME=$(basename $(pwd))
ADB="$(which adb)"
MAIN=GamesListActivity
MAIN=MainActivity
case $DIRNAME in
XWords4-dbg)

2
xwords4/android/scripts/find-and-ant.sh
View file

@ -88,5 +88,5 @@ if [ -n "$INSTALL" ]; then
fi
# if [ "$CMDS" != "${CMDS%%install}" ]; then
# adb shell am start -n org.eehouse.android.${PKG}/org.eehouse.android.${PKG}.GamesListActivity
# adb shell am start -n org.eehouse.android.${PKG}/org.eehouse.android.${PKG}.MainActivity
# fi