From 83636b67365c8d23692b68f44b377053b85ca84d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 21 Jul 2014 21:34:52 -0700
Subject: [PATCH] clean up trade UI setup

---
 xwords4/android/XWords4/res/layout/board.xml  |  1 +
 .../eehouse/android/xw4/BoardDelegate.java    | 23 ++++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/board.xml b/xwords4/android/XWords4/res/layout/board.xml
index 2e33ced2f..f85f79ef5 100644
--- a/xwords4/android/XWords4/res/layout/board.xml
+++ b/xwords4/android/XWords4/res/layout/board.xml
@@ -24,6 +24,7 @@
                 android:orientation="horizontal"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:visibility="gone"
                 >
     <Button android:id="@+id/exchange_commit"
             android:text="@string/button_trade_commit" 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index 3238bd43f..b758b9ddd 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -522,9 +522,13 @@ public class BoardDelegate extends DelegateBase
         m_timers = new TimerRunnable[4]; // needs to be in sync with
                                          // XWTimerReason
         m_view = (BoardView)findViewById( R.id.board_view );
-        m_tradeButtons = findViewById( R.id.exchange_buttons );
-        m_exchCommmitButton = setListenerOrHide( R.id.exchange_commit );
-        m_exchCancelButton = setListenerOrHide( R.id.exchange_cancel );
+        if ( ! ABUtils.haveActionBar() ) {
+            m_tradeButtons = findViewById( R.id.exchange_buttons );
+            m_exchCommmitButton = (Button)findViewById( R.id.exchange_commit );
+            m_exchCommmitButton.setOnClickListener( this );
+            m_exchCancelButton = (Button)findViewById( R.id.exchange_cancel );
+            m_exchCancelButton.setOnClickListener( this );
+        }
         m_volKeysZoom = XWPrefs.getVolKeysZoom( m_activity );
 
         Intent intent = getIntent();
@@ -2243,19 +2247,6 @@ public class BoardDelegate extends DelegateBase
         }
     }
     
-    private Button setListenerOrHide( int id )
-    {
-        Button button = (Button)findViewById( id );
-        if ( null != button ) {
-            if ( ABUtils.haveActionBar() ) {
-                button.setVisibility( View.INVISIBLE );
-            } else {
-                button.setOnClickListener( this );
-            }
-        }
-        return button;
-    }
-
     private static void noteSkip()
     {
         String msg = "BoardActivity.feedMessage[s](): skipped because "