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

Merge branch 'android_branch' into android_browsedict

Browse source
This commit is contained in:
eehouse@eehouse.org 2011-11-04 17:23:27 -07:00 committed by Andy2
commit 214f8990bf
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,7 +121,9 @@
<activity android:name="DictBrowseActivity"
android:configChanges="keyboardHidden|orientation"
/>
<activity android:name="ChatActivity"/>
<activity android:name="ChatActivity"
android:configChanges="keyboardHidden|orientation"
/>
<service android:name="RelayService"/>

12
xwords4/android/XWords4/jni/utilwrapper.c
View file

@ -287,11 +287,17 @@ and_util_engineProgressCallback( XW_UtilCtxt* uc )
bool
utilTimerFired( XW_UtilCtxt* uc, XWTimerReason why, int handle )
{
bool handled;
AndUtil* util = (AndUtil*)uc;
TimerStorage* timerStorage = &util->timerStorage[why];
XP_ASSERT( handle == (int)timerStorage );
return (handle == (int)timerStorage)
&& (*timerStorage->proc)( timerStorage->closure, why );
if ( handle == (int)timerStorage ) {
handled = (*timerStorage->proc)( timerStorage->closure, why );
} else {
XP_LOGF( "%s: mismatch: handle=%d; timerStorage=%d", __func__,
handle, (int)timerStorage );
handled = false;
}
return handled;
}
static void

16
xwords4/android/XWords4/res/layout/board.xml
View file

@ -44,10 +44,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<ImageButton android:id="@+id/dictlist_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/dicticon"
/>
<ImageButton android:id="@+id/prevhint_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/prev_hint"
@ -60,10 +56,6 @@
style="@style/toolbar_button"
android:src="@drawable/shuffle"
/>
<ImageButton android:id="@+id/flip_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/flip"
/>
<ImageButton android:id="@+id/zoom_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/zoom"
@ -72,6 +64,14 @@
style="@style/toolbar_button"
android:src="@drawable/undo"
/>
<ImageButton android:id="@+id/flip_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/flip"
/>
<ImageButton android:id="@+id/dictlist_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/dicticon"
/>
<ImageButton android:id="@+id/chat_button_horizontal"
style="@style/toolbar_button"
android:src="@drawable/stat_notify_chat"

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

@ -38,7 +38,7 @@
</style>
<style name="toolbar_button">
<item name="android:layout_width">48dp</item>
<item name="android:layout_width">58dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:layout_weight">1</item>
</style>

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -363,7 +363,10 @@ public class GameConfig extends XWActivity
(ArrayAdapter<String>)spinner.getAdapter();
if ( position < adapter.getCount() ) {
lp.dictName = adapter.getItem(position);
String name = adapter.getItem(position);
if ( ! name.equals( m_browseText ) ) {
lp.dictName = name;
}
}
lp.setIsRobot( Utils.getChecked( dialog, R.id.robot_check ) );