Fix zero suggestion for suggestions.

This CL:
https://chromium.googlesource.com/chromium/src/+/e9d6060f509e6a7b3a4f0bd944b1303a783f4a94
fixed an issue where suggestions were triggered on URL de-focus,
but it broke zero suggest because we trigger zero suggest on
focus before the animation completes.

To address this, this introduces a tri-state of allowed
suggestion visibility.  When focusing, we can request suggestions
but they won't be shown until the animation is complete.

When de-focusing, we disallow any suggestions being shown.

BUG=904367

Change-Id: I0a1b166158bc08bcc1f8d94b4fe15c6f4e663b02
Reviewed-on: https://chromium-review.googlesource.com/c/1331574Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607326}

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -47,6 +48,8 @@ import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -75,7 +78,17 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
     private ToolbarDataProvider mDataProvider;
     private boolean mNativeInitialized;
     private AutocompleteController mAutocomplete;
-    private boolean mCanShowSuggestions;
+
+    @IntDef({SuggestionVisibilityState.DISALLOWED, SuggestionVisibilityState.PENDING_ALLOW,
+            SuggestionVisibilityState.ALLOWED})
+    @Retention(RetentionPolicy.SOURCE)
+    private @interface SuggestionVisibilityState {
+        int DISALLOWED = 0;
+        int PENDING_ALLOW = 1;
+        int ALLOWED = 2;
+    }
+    @SuggestionVisibilityState
+    private int mSuggestionVisibilityState;
 
     // The timestamp (using SystemClock.elapsedRealtime()) at the point when the user started
     // modifying the omnibox with new input.
@@ -491,6 +504,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
     /** @see org.chromium.chrome.browser.omnibox.UrlFocusChangeListener#onUrlFocusChange(boolean) */
     void onUrlFocusChange(boolean hasFocus) {
         if (hasFocus) {
+            mSuggestionVisibilityState = SuggestionVisibilityState.PENDING_ALLOW;
             if (mNativeInitialized) {
                 startZeroSuggest();
             } else {
@@ -501,7 +515,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
                 });
             }
         } else {
-            mCanShowSuggestions = false;
+            mSuggestionVisibilityState = SuggestionVisibilityState.DISALLOWED;
             mHasStartedNewOmniboxEditSession = false;
             mNewOmniboxEditSessionTimestamp = -1;
             // Prevent any upcoming omnibox suggestions from showing once a URL is loaded (and as
@@ -516,7 +530,8 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
      * org.chromium.chrome.browser.omnibox.UrlFocusChangeListener#onUrlAnimationFinished(boolean)
      */
     void onUrlAnimationFinished(boolean hasFocus) {
-        mCanShowSuggestions = hasFocus;
+        mSuggestionVisibilityState =
+                hasFocus ? SuggestionVisibilityState.ALLOWED : SuggestionVisibilityState.DISALLOWED;
         updateOmniboxSuggestionsVisibility();
     }
 
@@ -840,7 +855,10 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
     @Override
     public void onSuggestionsReceived(
             List<OmniboxSuggestion> newSuggestions, String inlineAutocompleteText) {
-        if (mShouldPreventOmniboxAutocomplete || !mCanShowSuggestions) return;
+        if (mShouldPreventOmniboxAutocomplete
+                || mSuggestionVisibilityState == SuggestionVisibilityState.DISALLOWED) {
+            return;
+        }
 
         // This is a callback from a listener that is set up by onNativeLibraryReady,
         // so can only be called once the native side is set up unless we are showing
@@ -1014,7 +1032,8 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener {
      * Update whether the omnibox suggestions are visible.
      */
     private void updateOmniboxSuggestionsVisibility() {
-        boolean shouldBeVisible = mCanShowSuggestions && getSuggestionCount() > 0;
+        boolean shouldBeVisible = mSuggestionVisibilityState == SuggestionVisibilityState.ALLOWED
+                && getSuggestionCount() > 0;
         boolean wasVisible = mListPropertyModel.get(SuggestionListProperties.VISIBLE);
         mListPropertyModel.set(SuggestionListProperties.VISIBLE, shouldBeVisible);
         if (shouldBeVisible && !wasVisible) {