Hide PopupZoomer when the container view or window loses focus

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright 2012 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.content.browser;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 503 matching lines @@
     @VisibleForTesting
     public AdapterInputConnection getInputConnectionForTest() {
         return mInputConnection;
     }
 
     private ImeAdapter createImeAdapter(Context context) {
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
                         if (mPopupZoomer.isShowing()) {

[jdduke (slow), 2014/08/20 15:47:46]

Can you also just make this |mPopupZoomer.hide(true)| and remove the
conditional? The showing condition is checked in the |hide()| method so this is
just extra work/noise.

[raghu, 2014/08/21 06:23:59]

Done. I have done it in |onKeyUp| also.

Also, I feel, we should swap the order of |getContentViewClient().onImeEvent()|
and |hideTextHandles()| calls in this method. The client should be notified
after we are done with handling the ImeEvent. Please let me know your opinion
about it.

                             mPopupZoomer.hide(true);
                         }
                         getContentViewClient().onImeEvent();
                         hideTextHandles();
                     }
 
                     @Override
                     public void onDismissInput() {
                         getContentViewClient().onImeStateChangeRequested(false);
                     }
@@ skipping 212 matching lines @@
             public boolean onLongPress(View v, MotionEvent e) {
                 if (mNativeContentViewCore != 0) {
                     nativeLongPress(mNativeContentViewCore, e.getEventTime(), e.getX(), e.getY());
                 }
                 return true;
             }
         };
         mPopupZoomer.setOnTapListener(listener);
     }
 
+    @VisibleForTesting
+    public void setPopupZoomerForTest(PopupZoomer popupZoomer) {
+        mPopupZoomer = popupZoomer;
+    }
+
     /**
      * Destroy the internal state of the ContentView. This method may only be
      * called after the ContentView has been removed from the view system. No
      * other methods may be called on this ContentView after this method has
      * been called.
      */
     public void destroy() {
         if (mNativeContentViewCore != 0) {
             nativeOnJavaContentViewCoreDestroyed(mNativeContentViewCore);
         }
@@ skipping 668 matching lines @@
     public ContentSettings getContentSettings() {
         return mContentSettings;
     }
 
     private void hidePopups() {
         mUnselectAllOnActionModeDismiss = true;
         hideSelectActionBar();
         hidePastePopup();
         hideSelectPopup();
         hideTextHandles();
+        mPopupZoomer.hide(false);
     }
 
     public void hideSelectActionBar() {
         if (mActionMode != null) {
             mActionMode.finish();
             mActionMode = null;
         }
     }
 
     public boolean isSelectActionBarShowing() {
@@ skipping 181 matching lines @@
      * @see View#onWindowFocusChanged(boolean)
      */
     public void onWindowFocusChanged(boolean hasWindowFocus) {
         if (!hasWindowFocus) resetGestureDetection();
     }
 
     public void onFocusChanged(boolean gainFocus) {
         if (!gainFocus) {
             hideImeIfNeeded();
             cancelRequestToScrollFocusedEditableNodeIntoView();
-            hidePastePopup();
-            hideTextHandles();
+            hidePopups();

[jdduke (slow), 2014/08/20 15:47:46]

Will a select popup and/or action bar action cause the focus to change? This
change doesn't seem completely necessary to me, unless you're seeing that the
zoomer continues to steal focus after the focus change event.

[raghu, 2014/08/21 06:23:59]

No, they are not causing the focus to change. But anyways I have now changed it
to just hide the zoomer 

         }
         if (mNativeContentViewCore != 0) nativeSetFocus(mNativeContentViewCore, gainFocus);
     }
 
     /**
      * @see View#onKeyUp(int, KeyEvent)
      */
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (mPopupZoomer.isShowing() && keyCode == KeyEvent.KEYCODE_BACK) {
             mPopupZoomer.hide(true);
@@ skipping 1549 matching lines @@
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }