From 223d2d6e923b4b14b2f97356dfd69a00ce229421 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 4 Nov 2011 07:11:34 -0700 Subject: [PATCH 1/4] set configchanges on chat activity -- it handles orientations changes fine. --- xwords4/android/XWords4/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml index c254b2955..1e29f887d 100644 --- a/xwords4/android/XWords4/AndroidManifest.xml +++ b/xwords4/android/XWords4/AndroidManifest.xml @@ -121,7 +121,9 @@ - + From 0561ca5ab9865002000574a08812d770713038c6 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 4 Nov 2011 17:14:37 -0700 Subject: [PATCH 2/4] make buttons a bit wider since the bar scrolls now, and rearrange. --- xwords4/android/XWords4/res/layout/board.xml | 16 ++++++++-------- xwords4/android/XWords4/res/values/styles.xml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xwords4/android/XWords4/res/layout/board.xml b/xwords4/android/XWords4/res/layout/board.xml index 6e398d835..f7268d7cd 100644 --- a/xwords4/android/XWords4/res/layout/board.xml +++ b/xwords4/android/XWords4/res/layout/board.xml @@ -44,10 +44,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" > - - + + From 5123bebe500ae76599dc2f272d5b2b04a200fa82 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 4 Nov 2011 17:15:12 -0700 Subject: [PATCH 3/4] don't set dict name to "download more". Just not a good idea. --- .../XWords4/src/org/eehouse/android/xw4/GameConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java index 4c3e88916..51b80d9b6 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java @@ -363,7 +363,10 @@ public class GameConfig extends XWActivity (ArrayAdapter)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 ) ); From ac875894a68d5e4a47f109ac979d2f63d7afa234 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 4 Nov 2011 17:19:50 -0700 Subject: [PATCH 4/4] replace assert that occasionally fails with logging. Not sure why it fails, but I just drop the (timer) event in the non-debug case so it's probably harmless. --- xwords4/android/XWords4/jni/utilwrapper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xwords4/android/XWords4/jni/utilwrapper.c b/xwords4/android/XWords4/jni/utilwrapper.c index ff471ed14..8e065e038 100644 --- a/xwords4/android/XWords4/jni/utilwrapper.c +++ b/xwords4/android/XWords4/jni/utilwrapper.c @@ -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