Stop/reload button should hide if url bar is focussed.

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellToolbar.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.shell;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.util.AttributeSet;
@@ skipping 58 matching lines @@
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
     private TabManager mTabManager;
 
     private SuggestionPopup mSuggestionPopup;
 
     private ImageButton mStopReloadButton;
     private ImageButton mAddButton;
     private int mProgress = 0;
     private boolean mLoading = true;
+    private boolean mFocus = false;
 
     /**
      * @param context The Context the view is running in.
      * @param attrs   The attributes of the XML tag that is inflating the view.
      */
     public ChromeShellToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
         // When running performance benchmark, we don't want to observe the tab
         // invalidation which would interfere with browser's processing content
         // frame. See crbug.com/394976.
@@ skipping 82 matching lines @@
                 mUrlTextView.clearFocus();
                 setKeyboardVisibilityForUrl(false);
                 tab.getView().requestFocus();
                 return true;
             }
         });
         mUrlTextView.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                 setKeyboardVisibilityForUrl(hasFocus);
-                mStopReloadButton.setVisibility(hasFocus ? GONE : VISIBLE);
+                mFocus = hasFocus;
+                updateToolBarButtonState();
                 if (!hasFocus && mTab != null) {
                     mUrlTextView.setText(mTab.getWebContents().getUrl());
                     mSuggestionPopup.dismissPopup();
                 }
             }
         });
         mUrlTextView.setOnKeyListener(new OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ skipping 57 matching lines @@
         mAddButton = (ImageButton) findViewById(R.id.add_button);
         mAddButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 mTabManager.createNewTab();
             }
         });
     }
 
     /**
      * Shows or hides the add and the stop/reload button .

[Bernhard Bauer, 2015/02/12 11:49:11]

Nit: remove the space before the period.

      * @param visibility The visibility status of the add button.

[Bernhard Bauer, 2015/02/12 11:49:11]

Javadoc comment is now outdated.

      */
-    public void showAddButton(boolean visibility) {
-        mAddButton.setVisibility(visibility ? VISIBLE : GONE);
-        mStopReloadButton.setVisibility(visibility ? GONE : VISIBLE);
+    public void updateToolBarButtonState() {
+        boolean tabSwitcherState = mTabManager.isTabSwitcherVisible();
+        mAddButton.setVisibility(tabSwitcherState ? VISIBLE : GONE);
+        mStopReloadButton.setVisibility(tabSwitcherState || mFocus ? GONE : VISIBLE);
     }
 
     /**
      * @return Current tab that is shown by ChromeShell.
      */
     public ChromeShellTab getCurrentTab() {
         return mTab;
     }
 
     /**
@@ skipping 21 matching lines @@
         public void onLoadProgressChanged(Tab tab, int progress) {
             if (tab == mTab) ChromeShellToolbar.this.onLoadProgressChanged(progress);
         }
 
         @Override
         public void onUpdateUrl(Tab tab, String url) {
             if (tab == mTab) ChromeShellToolbar.this.onUpdateUrl(url);
         }
     }
 }