From 8f3c4f6426860b9294c816e3692a353630020e44 Mon Sep 17 00:00:00 2001 From: Andy2 Date: Fri, 28 Oct 2011 22:24:47 -0700 Subject: [PATCH] add config option to enable face-up tile picking --- xwords4/android/XWords4/res/layout/game_config.xml | 5 +++++ xwords4/android/XWords4/res/values/strings.xml | 1 + .../XWords4/src/org/eehouse/android/xw4/GameConfig.java | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xwords4/android/XWords4/res/layout/game_config.xml b/xwords4/android/XWords4/res/layout/game_config.xml index f8e0744e7..fe92d5d5c 100644 --- a/xwords4/android/XWords4/res/layout/game_config.xml +++ b/xwords4/android/XWords4/res/layout/game_config.xml @@ -217,6 +217,11 @@ android:entries="@array/phony_names" /> + diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index e1330eeff..c97862f5d 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -1786,6 +1786,7 @@ Undo last Pick for me Tile picker\n(so far: %s) + Pick tiles face-up 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 69416fb7c..40b1c204d 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java @@ -114,6 +114,7 @@ public class GameConfig extends XWActivity ,R.id.room_spinner ,R.id.refresh_button ,R.id.hints_allowed + ,R.id.pick_faceup ,R.id.use_timer ,R.id.timer_minutes_edit ,R.id.smart_robot @@ -514,7 +515,10 @@ public class GameConfig extends XWActivity setSmartnessSpinner(); - Utils.setChecked( this, R.id.hints_allowed, !m_gi.hintsNotAllowed ); + Utils.setChecked( this, R.id.hints_allowed, + !m_gi.hintsNotAllowed ); + Utils.setChecked( this, R.id.pick_faceup, + m_gi.allowPickTiles ); Utils.setInt( this, R.id.timer_minutes_edit, m_gi.gameSeconds/60/m_gi.nPlayers ); @@ -950,6 +954,7 @@ public class GameConfig extends XWActivity private void saveChanges() { m_gi.hintsNotAllowed = !Utils.getChecked( this, R.id.hints_allowed ); + m_gi.allowPickTiles = Utils.getChecked( this, R.id.pick_faceup ); m_gi.timerEnabled = Utils.getChecked( this, R.id.use_timer ); m_gi.gameSeconds = 60 * m_gi.nPlayers * Utils.getInt( this, R.id.timer_minutes_edit );