Put the values button back (and remove the corresponding menuitem).

xwords4/android/XWords4/res/layout/board.xml

@@ -60,6 +60,10 @@
                    style="@style/toolbar_button"
     	           android:src="@drawable/zoom"
                    />
+   	  <ImageButton android:id="@+id/values_button_horizontal"
+                   style="@style/toolbar_button"
+    	           android:src="@drawable/values"
+                   />
    	  <ImageButton android:id="@+id/undo_button_horizontal"
                    style="@style/toolbar_button"
     	           android:src="@drawable/undo"

xwords4/android/XWords4/res/menu/board_menu.xml

@@ -23,11 +23,6 @@
           android:alphabeticShortcut="H"
           />
 
-    <item android:id="@+id/board_menu_values"
-          android:title="@string/board_menu_values"
-          android:alphabeticShortcut="V"
-          />
-
     <item android:title="@string/board_submenu_game">
       <menu>
         <item android:id="@+id/board_menu_game_counts"

xwords4/android/XWords4/res/values/common_rsrc.xml

@@ -76,6 +76,7 @@
   <string name="key_notagain_trading">key_notagain_trading</string>
   <string name="key_na_lookup">key_na_lookup</string>
   <string name="key_na_browse">key_na_browse</string>
+  <string name="key_na_values">key_na_values</string>
 
   <!-- Name is not localized -->
   <string name="app_name">Crosswords</string>  

xwords4/android/XWords4/res/values/strings.xml

@@ -658,12 +658,6 @@
          games.-->
 	<string name="board_menu_undo_last">Undo last</string>
 
-    <!-- Toggles the board between displaying tiles' letters and their
-         values.  This is intended to allow players to remind
-         themselves how much played tiles are worth while planning a
-         move. -->
-	<string name="board_menu_values">Show values</string>
-
     <!-- Title of submenu -->
 	<string name="board_submenu_game">Game</string>
 
@@ -1622,8 +1616,13 @@
     <string name="not_again_chat">This button opens the screen for
       messaging between devices in this game.  Messages will be kept
       until you delete the game that contains them.</string>
-
-
+    <!-- Shown when you tap the values button on the toolbar of the
+         main Board screen.  This is intended to allow players to
+         remind themselves how much played tiles are worth while
+         planning a move. -->
+    <string name="not_again_values">This button changes whether the
+        board shows letters on placed tiles or their point values.
+        Use it to remind yourself what a tile is worth.</string>
     <!-- This is shown when you choose the board_menu_done menu item.
          It's to let you know that there's a shortcut that does almost
          the same thing. -->

xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java

@@ -93,6 +93,7 @@ public class BoardActivity extends XWActivity
     private static final int START_TRADE_ACTION = 13;
     private static final int LOOKUP_ACTION = 14;
     private static final int BUTTON_BROWSE_ACTION = 15;
+    private static final int VALUES_ACTION = 16;
 
     private static final String DLG_TITLE = "DLG_TITLE";
     private static final String DLG_TITLESTR = "DLG_TITLESTR";
@@ -610,9 +611,6 @@ public class BoardActivity extends XWActivity
         case R.id.board_menu_undo_last:
             showConfirmThen( R.string.confirm_undo_last, UNDO_LAST_ACTION );
             break;
-        case R.id.board_menu_values:
-            cmd = JNIThread.JNICmd.CMD_VALUES;
-            break;
         case R.id.board_menu_game_counts:
             m_jniThread.handle( JNIThread.JNICmd.CMD_COUNTS_VALUES,
                                 R.string.counts_values_title );
@@ -715,6 +713,9 @@ public class BoardActivity extends XWActivity
             case UNDO_ACTION:
                 cmd = JNIThread.JNICmd.CMD_UNDO_CUR;
                 break;
+            case VALUES_ACTION:
+                cmd = JNIThread.JNICmd.CMD_VALUES;
+                break;
             case CHAT_ACTION:
                 startChatActivity();
                 break;
@@ -1440,6 +1441,10 @@ public class BoardActivity extends XWActivity
                                R.string.not_again_zoom,
                                R.string.key_notagain_zoom,
                                ZOOM_ACTION );
+        m_toolbar.setListener( Toolbar.BUTTON_VALUES,
+                               R.string.not_again_values,
+                               R.string.key_na_values,
+                               VALUES_ACTION );
         m_toolbar.setListener( Toolbar.BUTTON_UNDO,
                                R.string.not_again_undo,
                                R.string.key_notagain_undo,
@@ -1568,7 +1573,8 @@ public class BoardActivity extends XWActivity
 
     private void updateToolbar()
     {
-        m_toolbar.update( Toolbar.BUTTON_FLIP, m_gsi.visTileCount > 1 );
+        m_toolbar.update( Toolbar.BUTTON_FLIP, m_gsi.visTileCount >= 1 );
+        m_toolbar.update( Toolbar.BUTTON_VALUES, m_gsi.visTileCount >= 1 );
         m_toolbar.update( Toolbar.BUTTON_JUGGLE, m_gsi.canShuffle );
         m_toolbar.update( Toolbar.BUTTON_UNDO, m_gsi.canRedo );
         m_toolbar.update( Toolbar.BUTTON_HINT_PREV, m_gsi.canHint );

xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java

@@ -47,6 +47,7 @@ public class Toolbar {
     public static final int BUTTON_ZOOM = 5;
     public static final int BUTTON_UNDO = 6;
     public static final int BUTTON_CHAT = 7;
+    public static final int BUTTON_VALUES = 8;
 
     private static TBButtonInfo[] s_buttonInfo = {
         // BUTTON_BROWSE_DICT
@@ -65,6 +66,8 @@ public class Toolbar {
         new TBButtonInfo( R.id.undo_button_horizontal ),
         // BUTTON_CHAT
         new TBButtonInfo( R.id.chat_button_horizontal ),
+        // BUTTON_VALUES
+        new TBButtonInfo( R.id.values_button_horizontal ),
     };
 
     private XWActivity m_activity;