From 0474984b82b1e925b5fcb720dedb7a70f520be9b Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Tue, 6 Dec 2011 18:18:50 -0800
Subject: [PATCH] export new preference from jni and add a checkbox setting for
 it

---
 xwords4/android/XWords4/jni/xwjni.c                  |  3 +++
 xwords4/android/XWords4/res/values/common_rsrc.xml   |  1 +
 xwords4/android/XWords4/res/values/strings.xml       | 12 ++++++++++++
 xwords4/android/XWords4/res/xml/xwprefs.xml          |  5 +++++
 .../src/org/eehouse/android/xw4/jni/CommonPrefs.java |  4 +++-
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c
index fb46716d8..5f8a2b99f 100644
--- a/xwords4/android/XWords4/jni/xwjni.c
+++ b/xwords4/android/XWords4/jni/xwjni.c
@@ -177,6 +177,9 @@ loadCommonPrefs( JNIEnv* env, CommonPrefs* cp, jobject j_cp )
     cp->showColors = getBool( env, j_cp, "showColors" );
     cp->sortNewTiles = getBool( env, j_cp, "sortNewTiles" );
     cp->allowPeek = getBool( env, j_cp, "allowPeek" );
+#ifdef XWFEATURE_CROSSHAIRS
+    cp->hideCrosshairs = getBool( env, j_cp, "hideCrosshairs" );
+#endif
 }
 
 static XWStreamCtxt*
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index cfb2f5abd..cd53aec50 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -12,6 +12,7 @@
   <string name="key_skip_confirm">key_skip_confirm</string>
   <string name="key_sort_tiles">key_sort_tiles</string>
   <string name="key_peek_other">key_peek_other</string>
+  <string name="key_hide_crosshairs">key_hide_crosshairs</string>
   <string name="key_hide_values">key_hide_values</string>
   <string name="key_ringer_zoom">key_ringer_zoom</string>
   <string name="key_hide_title">key_hide_title</string>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 45e455b90..cf35111c7 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -1057,6 +1057,18 @@
     <string name="peek_other_summary">Tapping on scoreboard name shows
         that player\'s tiles</string>
 
+    
+    <!-- If this preference is checked the "crosshairs" (vertical and
+         horzontal lines through the cell your finger is on that help
+         you tell where the app thinks you're actually tapping) will
+         not be shown.  Some users have complained that this feature
+         is distracting, presumably because they're using tablets with
+         large enough screens that they always know where they're
+         tapping. -->
+    <string name="hide_crosshairs">Disable crosshairs</string>
+    <!-- explanation of the above -->
+    <string name="hide_crosshairs_summary">Do not visually indicate which board cell is touched</string>
+
     <string name="network_behavior">Network game settings</string>
     <!-- explanation of the above -->
     <string name="network_behavior_summary">Settings that apply to
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index c961870b2..40fc7b009 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -231,6 +231,11 @@
                         android:summary="@string/ringer_zoom_summary"
                         android:defaultValue="false"
                         />
+    <CheckBoxPreference android:key="@string/key_hide_crosshairs"
+                        android:title="@string/hide_crosshairs"
+                        android:summary="@string/hide_crosshairs_summary"
+                        android:defaultValue="false"
+                        />
     <CheckBoxPreference android:key="@string/key_peek_other"
                         android:title="@string/peek_other"
                         android:summary="@string/peek_other_summary"
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
index e600236ab..a448c625a 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java
@@ -1,6 +1,6 @@
 /* -*- compile-command: "cd ../../../../../../; ant debug install"; -*- */
 /*
- * Copyright 2009-2010 by Eric House (xwords@eehouse.org).  All
+ * Copyright 2009 - 2011 by Eric House (xwords@eehouse.org).  All
  * rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -48,6 +48,7 @@ public class CommonPrefs {
     public boolean showColors;
     public boolean sortNewTiles;
     public boolean allowPeek;
+    public boolean hideCrosshairs;
 
     public int[] playerColors;
     public int[] bonusColors;
@@ -78,6 +79,7 @@ public class CommonPrefs {
         showColors = getBoolean( context, sp, R.string.key_color_tiles, true );
         sortNewTiles = getBoolean( context, sp, R.string.key_sort_tiles, true );
         allowPeek = getBoolean( context, sp, R.string.key_peek_other, false );
+        hideCrosshairs = getBoolean( context, sp, R.string.key_hide_crosshairs, false );
 
         int ids[] = { R.string.key_player0,
                       R.string.key_player1,