From f303fa26534fc983e53d2dda36bd76ff7409e3c5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 15 Nov 2013 20:52:05 -0800
Subject: [PATCH] debug features and logging are always on/available for debug
 builds

---
 xwords4/android/XWords4/res/values/common_rsrc.xml           | 5 +++++
 xwords4/android/XWords4/res/xml/xwprefs.xml                  | 5 +++--
 .../XWords4/src/org/eehouse/android/xw4/GamesList.java       | 3 ++-
 .../src/org/eehouse/android/xw4/XWSumListPreference.java     | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index 37bcc7b44..92435ae75 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -132,6 +132,11 @@
   <string name="redir_host">Invite redirect host</string>
   <string name="dict_host">Wordlist download URL</string>
   <string name="logging_on">Enable logging</string>
+  <string name="logging_on_summary">(release builds only)</string>
+  <string name="debug_features">Enable debug features</string>
+  <string name="debug_features_summary">Menuitems etc. (release builds
+  only)</string>
+
   <string name="git_rev_title">Source version id</string>
   <string name="relay_port">Relay game port</string>
   <string name="proxy_port">Relay device port</string>
diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml
index 1c1ff0c02..db162f36f 100644
--- a/xwords4/android/XWords4/res/xml/xwprefs.xml
+++ b/xwords4/android/XWords4/res/xml/xwprefs.xml
@@ -311,11 +311,12 @@
 			            />
     <CheckBoxPreference android:key="@string/key_logging_on"
 			            android:title="@string/logging_on"
+			            android:summary="@string/logging_on_summary"
 			            android:defaultValue="false"
 			            />
     <CheckBoxPreference android:key="@string/key_enable_debug"
-                        android:title="Enable debug features"
-                        android:summary="Menuitems etc."
+                        android:title="@string/debug_features"
+                        android:summary="@string/debug_features_summary"
                         android:defaultValue="false"
                         />
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index 62672291c..86f0859ea 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -665,7 +665,8 @@ public class GamesList extends XWExpandableListActivity
         if ( m_menuPrepared ) {
             boolean nothingSelected = 0 == (nGroupsSelected + nGamesSelected);
         
-            boolean showDbg = XWPrefs.getDebugEnabled( this );
+            boolean showDbg = BuildConstants.IS_DEBUG_BUILD
+                || XWPrefs.getDebugEnabled( this );
             showItemsIf( DEBUG_ITEMS, menu, nothingSelected && showDbg );
             Utils.setItemVisible( menu, R.id.games_menu_loaddb, 
                                   showDbg && !DBUtils.gameDBExists( this ) );
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
index 8bfa356d4..b744af7c9 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWSumListPreference.java
@@ -35,7 +35,8 @@ public class XWSumListPreference extends XWListPreference {
     {
         super.onAttachedToActivity();
 
-        if ( XWPrefs.getDebugEnabled( m_context ) ) {
+        if ( BuildConstants.IS_DEBUG_BUILD ||
+             XWPrefs.getDebugEnabled( m_context ) ) {
             CharSequence[] entries = getEntries();
             String lastRow
                 = m_context.getString( R.string.game_summary_field_rowid );