🔍 Introduce default search engine dialog

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java

 // Copyright 2017 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.browser.searchwidget;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.chromium.base.Callback;
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.omnibox.AutocompleteController;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
 /** Queries the user's default search engine and shows autocomplete suggestions. */
 public class SearchActivity extends AsyncInitializationActivity
         implements SnackbarManageable, SearchActivityLocationBarLayout.Delegate {
+    private static final String TAG = "searchwidget";
+
     /** Setting this field causes the Activity to finish itself immediately for tests. */
     private static boolean sIsDisabledForTest;
 
     /** Main content view. */
     private ViewGroup mContentView;
 
-    /** Whether the native library has been loaded. */
-    private boolean mIsNativeReady;
+    /** Whether the user is now allowed to perform searches. */
+    private boolean mIsActivityUsable;
 
     /** Input submitted before before the native library was loaded. */
     private String mQueuedUrl;
 
     /** The View that represents the search box. */
     private SearchActivityLocationBarLayout mSearchBox;
 
     private SnackbarManager mSnackbarManager;
     private SearchBoxDataProvider mSearchBoxDataProvider;
     private Tab mTab;
@@ skipping 27 matching lines @@
         // Build the search box.
         mContentView = createContentView();
         mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                 R.id.search_location_bar);
         mSearchBox.setDelegate(this);
         mSearchBox.setToolbarDataProvider(mSearchBoxDataProvider);
         mSearchBox.initializeControls(new WindowDelegate(getWindow()), getWindowAndroid());
         setContentView(mContentView);
 
         // Kick off everything needed for the user to type into the box.
+        // TODO(dfalcantara): We should prevent the user from doing anything while we're running the
+        //                    logic to determine if they need to see a search engine promo.  Given
+        //                    that the logic requires native to be loaded, we'll have to make some
+        //                    easy Java-only first-pass checks.
         beginQuery();
         mSearchBox.showCachedZeroSuggestResultsIfAvailable();
 
         // Kick off loading of the native library.
         mHandler.post(new Runnable() {
             @Override
             public void run() {
                 beginLoadingLibrary();
             }
         });
     }
 
     @Override
     public void finishNativeInitialization() {
         super.finishNativeInitialization();
-        mIsNativeReady = true;
 
         mTab = new Tab(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID),
                 Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
                 TabLaunchType.FROM_EXTERNAL_APP, null, null);
         mTab.initialize(WebContentsFactory.createWebContents(false, false), null,
                 new TabDelegateFactory(), false, false);
         mTab.loadUrl(new LoadUrlParams("about:blank"));
 
         mSearchBoxDataProvider.onNativeLibraryReady(mTab);
         mSearchBox.onNativeLibraryReady();
 
-        if (mQueuedUrl != null) loadUrl(mQueuedUrl);
-
-        mHandler.post(new Runnable() {
+        // Force the user to choose a search engine if they have to.
+        final Callback<Boolean> deferredCallback = new Callback<Boolean>() {
             @Override
-            public void run() {
-                onDeferredStartup();
+            public void onResult(Boolean result) {
+                finishDeferredInitialization(result);
             }
-        });
+        };
+        if (!LocaleManager.getInstance().showSearchEnginePromoIfNeeded(this, deferredCallback)) {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    deferredCallback.onResult(true);
+                }
+            });
+        }
     }
 
-    @Override
-    public void onDeferredStartup() {
-        super.onDeferredStartup();
+    private void finishDeferredInitialization(Boolean result) {
+        if (result == null || !result.booleanValue()) {
+            Log.e(TAG, "User failed to select a default search engine.");
+            finish();

[Ted C, 2017/04/27 16:40:46]

and remove task?

pre-L, will this still be in recents and clickable?  does it show the dialog
again then?

[gone, 2017/04/27 17:48:52]

It doesn't seem to be in recents; the AndroidManifest hides it explicitly with
an "excludeFromRecents".

[Ted C, 2017/04/27 18:10:32]

Acknowledged.

+            return;
+        }
+
+        mIsActivityUsable = true;
+        if (mQueuedUrl != null) loadUrl(mQueuedUrl);
 
         AutocompleteController.nativePrefetchZeroSuggestResults();
         CustomTabsConnection.getInstance(getApplication()).warmup(0);
         mSearchBox.onDeferredStartup(isVoiceSearchIntent());
     }
 
     @Override
     protected View getViewToBeDrawnBeforeInitializingNative() {
         return mSearchBox;
     }
@@ skipping 26 matching lines @@
     }
 
     @Override
     public boolean shouldStartGpuProcess() {
         return true;
     }
 
     @Override
     public void loadUrl(String url) {
         // Wait until native has loaded.
-        if (!mIsNativeReady) {
+        if (!mIsActivityUsable) {
             mQueuedUrl = url;
             return;
         }
 
         // Don't do anything if the input was empty. This is done after the native check to prevent
         // resending a queued query after the user deleted it.
         if (TextUtils.isEmpty(url)) return;
 
         // Fix up the URL and send it to the full browser.
         String fixedUrl = UrlFormatter.fixupUrl(url);
@@ skipping 26 matching lines @@
         finish();
         overridePendingTransition(0, R.anim.activity_close_exit);
     }
 
     /** See {@link #sIsDisabledForTest}. */
     @VisibleForTesting
     static void disableForTests() {
         sIsDisabledForTest = true;
     }
 }