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;
+                updateStopReloadButtonState(hasFocus);
                 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 .
+     * Shows or hides the add button .
      * @param visibility The visibility status of the add button.
      */
     public void showAddButton(boolean visibility) {
         mAddButton.setVisibility(visibility ? VISIBLE : GONE);
-        mStopReloadButton.setVisibility(visibility ? GONE : VISIBLE);
+        updateStopReloadButtonState(visibility);
     }
 
     /**
+     * Shows or hides the stop/reload button .
+     * @param visibility The visibility status of the stop/reload button.

[Bernhard Bauer, 2015/02/12 09:55:09]

This parameter doesn't really control the visibility of the button. For one, if
it's set to true, the button is *hidden*, and if it's set to false, the button
is hidden only if |mFocus| is false. In terms of reducing the number of hacks,
this is not going in the right direction.

Let me repeat the invariants:
* The stop/reload button is visible if the URL field is not focused and the tab
switcher is not shown.
* The "add tab" button is visible if the tab switcher is shown.

You can translate this straight into code, with one method that updates the
status of each button, and which is called whenever any of its dependencies
changes.

+     */
+    public void updateStopReloadButtonState(boolean visibility) {
+        mStopReloadButton.setVisibility(mFocus || visibility ? GONE : VISIBLE);
+    }
+
+    /**
      * @return Current tab that is shown by ChromeShell.
      */
     public ChromeShellTab getCurrentTab() {
         return mTab;
     }
 
     /**
      * Change the visibility of the software keyboard.
      * @param visible Whether the keyboard should be shown or hidden.
      */
@@ skipping 18 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);
         }
     }
 }