Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

merge android_branch

Browse source
This commit is contained in:
Eric House 2014-10-14 06:57:52 -07:00
commit 52465b3e1e
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -307,10 +307,6 @@
<PreferenceScreen android:title="@string/advanced" <PreferenceScreen android:title="@string/advanced"
android:summary="@string/advanced_summary" android:summary="@string/advanced_summary"
> >
<EditTextPreference android:title="@string/git_rev_title"
android:summary="@string/git_rev"
android:enabled="false"
/>
<CheckBoxPreference android:key="@string/key_logging_on" <CheckBoxPreference android:key="@string/key_logging_on"
android:title="@string/logging_on" android:title="@string/logging_on"
android:summary="@string/logging_on_summary" android:summary="@string/logging_on_summary"
@ -401,5 +397,10 @@
android:summary="Get intermediate builds" android:summary="Get intermediate builds"
android:defaultValue="false" android:defaultValue="false"
/> />
<EditTextPreference android:title="@string/git_rev_title"
android:summary="@string/git_rev"
android:enabled="false"
/>
</PreferenceScreen> </PreferenceScreen>
</PreferenceScreen> </PreferenceScreen>

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
View file

@ -431,11 +431,6 @@ public class GameConfigDelegate extends DelegateBase
m_smartnessSpinner = (Spinner)findViewById( R.id.smart_robot ); m_smartnessSpinner = (Spinner)findViewById( R.id.smart_robot );
} // init } // init
protected void onStart()
{
loadGame();
}
@Override @Override
protected void onResume() protected void onResume()
{ {
@ -1112,7 +1107,10 @@ public class GameConfigDelegate extends DelegateBase
private void applyChanges( boolean forceNew ) private void applyChanges( boolean forceNew )
{ {
GameUtils.applyChanges( m_activity, m_gi, m_car, m_gameLock, forceNew ); if ( null != m_gameLock ) {
GameUtils.applyChanges( m_activity, m_gi, m_car, m_gameLock,
forceNew );
}
} }
private void launchGame() private void launchGame()

2
xwords4/android/scripts/arelease.sh
View file

@ -80,7 +80,7 @@ for PACK_UNSIGNED in $FILES; do
rm -f $PACK_SIGNED rm -f $PACK_SIGNED
zipalign -v 4 $PACK_UNSIGNED $PACK_SIGNED zipalign -v 4 $PACK_UNSIGNED $PACK_SIGNED
[ -n "$XW_WWW_PATH" ] && cp $PACK_SIGNED $XW_WWW_PATH [ -n "$XW_WWW_PATH" ] && cp $PACK_SIGNED $XW_WWW_PATH
TARGET="${PACK_SIGNED%.apk}_$(git describe).apk" TARGET="${PACK_SIGNED%.apk}_$(git rev-parse --verify HEAD)_$(git describe).apk"
cp $PACK_SIGNED "${TARGET}" cp $PACK_SIGNED "${TARGET}"
echo "created ${TARGET}" >&2 echo "created ${TARGET}" >&2
[ -n "$LIST_FILE" ] && echo ${TARGET} >> $LIST_FILE [ -n "$LIST_FILE" ] && echo ${TARGET} >> $LIST_FILE

4
xwords4/common/model.c
View file

@ -1826,12 +1826,12 @@ XP_U16
model_getDividerLoc( const ModelCtxt* model, XP_S16 turn ) model_getDividerLoc( const ModelCtxt* model, XP_S16 turn )
{ {
XP_ASSERT( turn >= 0 ); XP_ASSERT( turn >= 0 );
PlayerCtxt* player = &model->players[turn]; const PlayerCtxt* player = &model->players[turn];
return player->dividerLoc; return player->dividerLoc;
} }
void void
model_setDividerLoc( const ModelCtxt* model, XP_S16 turn, XP_U16 loc ) model_setDividerLoc( ModelCtxt* model, XP_S16 turn, XP_U16 loc )
{ {
XP_ASSERT( turn >= 0 ); XP_ASSERT( turn >= 0 );
PlayerCtxt* player = &model->players[turn]; PlayerCtxt* player = &model->players[turn];

2
xwords4/common/model.h
View file

@ -153,7 +153,7 @@ void model_addPlayerTile( ModelCtxt* model, XP_S16 turn, XP_S16 index,
void model_moveTileOnTray( ModelCtxt* model, XP_S16 turn, XP_S16 indexCur, void model_moveTileOnTray( ModelCtxt* model, XP_S16 turn, XP_S16 indexCur,
XP_S16 indexNew ); XP_S16 indexNew );
XP_U16 model_getDividerLoc( const ModelCtxt* model, XP_S16 turn ); XP_U16 model_getDividerLoc( const ModelCtxt* model, XP_S16 turn );
void model_setDividerLoc( const ModelCtxt* model, XP_S16 turn, XP_U16 loc ); void model_setDividerLoc( ModelCtxt* model, XP_S16 turn, XP_U16 loc );
/* As an optimization, return a pointer to the model's array of tiles for a /* As an optimization, return a pointer to the model's array of tiles for a
player. Don't even think about modifying the array!!!! */ player. Don't even think about modifying the array!!!! */