Changed the constraints for hiding the top controls

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.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 724 matching lines @@
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
                         mPopupZoomer.hide(true);
                         getContentViewClient().onImeEvent();
                         if (mFocusedNodeEditable) dismissTextHandles();
                     }
 
                     @Override
-                    public void onDismissInput() {
-                        getContentViewClient().onImeStateChangeRequested(false);
-                    }
-
-                    @Override
                     public void onKeyboardBoundsUnchanged() {
                         assert mWebContents != null;
                         mWebContents.scrollFocusedEditableNodeIntoView();
                     }
 
                     @Override
                     public boolean performContextMenuAction(int id) {
                         assert mWebContents != null;
                         switch (id) {
                             case android.R.id.selectAll:
@@ skipping 16 matching lines @@
                     @Override
                     public View getAttachedView() {
                         return mContainerView;
                     }
 
                     @Override
                     public ResultReceiver getNewShowKeyboardReceiver() {
                         return new ResultReceiver(new Handler()) {
                             @Override
                             public void onReceiveResult(int resultCode, Bundle resultData) {
-                                getContentViewClient().onImeStateChangeRequested(
-                                        resultCode == InputMethodManager.RESULT_SHOWN
-                                        || resultCode == InputMethodManager.RESULT_UNCHANGED_SHOWN);
                                 if (resultCode == InputMethodManager.RESULT_SHOWN) {
                                     // If OSK is newly shown, delay the form focus until
                                     // the onSizeChanged (in order to adjust relative to the
                                     // new size).
                                     // TODO(jdduke): We should not assume that onSizeChanged will
                                     // always be called, crbug.com/294908.
                                     getContainerView().getWindowVisibleDisplayFrame(
                                             mFocusPreOSKViewportRect);
                                 } else if (hasFocus() && resultCode
                                         == InputMethodManager.RESULT_UNCHANGED_SHOWN) {
@@ skipping 1490 matching lines @@
     }
 
     /**
      * Hides the IME if the containerView is the active view for IME.
      */
     public void hideImeIfNeeded() {
         // Hide input method window from the current view synchronously
         // because ImeAdapter does so asynchronouly with a delay, and
         // by the time when ImeAdapter dismisses the input, the
         // containerView may have lost focus.
-        // We cannot trust ContentViewClient#onImeStateChangeRequested to
-        // hide the input window because it has an empty default implementation.
-        // So we need to explicitly hide the input method window here.
         if (mInputMethodManagerWrapper.isActive(mContainerView)) {
             mInputMethodManagerWrapper.hideSoftInputFromWindow(
                     mContainerView.getWindowToken(), 0, null);
         }
-        getContentViewClient().onImeStateChangeRequested(false);
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void updateFrameInfo(
             float scrollOffsetX, float scrollOffsetY,
             float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor,
             float contentWidth, float contentHeight,
             float viewportWidth, float viewportHeight,
             float controlsOffsetYCss, float contentOffsetYCss,
@@ skipping 67 matching lines @@
         TraceEvent.end("ContentViewCore:updateFrameInfo");
     }
 
     @CalledByNative
     private void updateImeAdapter(long nativeImeAdapterAndroid, int textInputType,
             int textInputFlags, String text, int selectionStart, int selectionEnd,
             int compositionStart, int compositionEnd, boolean showImeIfNeeded,
             boolean isNonImeChange) {
         try {
             TraceEvent.begin("ContentViewCore.updateImeAdapter");
-            mFocusedNodeEditable = (textInputType != TextInputType.NONE);
-            if (!mFocusedNodeEditable) hidePastePopup();
+            boolean focusedNodeEditable = (textInputType != TextInputType.NONE);
+            if (!focusedNodeEditable) hidePastePopup();
 
             mImeAdapter.updateKeyboardVisibility(
                     nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded);
 
             if (mInputConnection != null) {
                 mInputConnection.updateState(text, selectionStart, selectionEnd, compositionStart,
                         compositionEnd, isNonImeChange);
             }
 
             if (mActionMode != null) mActionMode.invalidate();
+
+            if (focusedNodeEditable != mFocusedNodeEditable) {
+                mFocusedNodeEditable = focusedNodeEditable;
+                getContentViewClient().onFocusedNodeEditabilityChanged(mFocusedNodeEditable);
+            }
         } finally {
             TraceEvent.end("ContentViewCore.updateImeAdapter");
         }
     }
 
     @CalledByNative
     private void forceUpdateImeAdapter(long nativeImeAdapterAndroid) {
         mImeAdapter.attach(nativeImeAdapterAndroid);
     }
 
@@ skipping 829 matching lines @@
             String textTrackFontVariant, String textTrackTextColor, String textTrackTextShadow,
             String textTrackTextSize);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 
     private native void nativeSetDrawsContent(long nativeContentViewCoreImpl, boolean draws);
 }