[Android] Allow setting recently visited search engines as default search engine

chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java

 // Copyright 2015 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.preferences;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ skipping 16 matching lines @@
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.preferences.website.GeolocationInfo;
 import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences;
 import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
+import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlType;
 import org.chromium.components.location.LocationUtils;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
 * A custom adapter for listing search engines.
 */
 public class SearchEngineAdapter extends BaseAdapter implements LoadListener, OnClickListener {
     /**
      * A callback for reporting progress to the owner.
      */
     public interface SelectSearchEngineCallback {
@@ skipping 50 matching lines @@
     private void initEntries() {
         TemplateUrlService templateUrlService = TemplateUrlService.getInstance();
         if (!templateUrlService.isLoaded()) {
             templateUrlService.registerLoadListener(this);
             templateUrlService.load();
             return;  // Flow continues in onTemplateUrlServiceLoaded below.
         }
 
         // Fetch all the search engine info and the currently active one.
         mSearchEngines = templateUrlService.getLocalizedSearchEngines();
         int searchEngineIndex = templateUrlService.getDefaultSearchEngineIndex();

[Ian Wen, 2016/09/27 04:42:00]

Rename this to be defaultEngineIndex.

[ltian, 2016/09/28 19:19:46]

Done.

+
+        for (int i = 0; i < mSearchEngines.size(); ++i) {
+            setSearchEngineType(mSearchEngines.get(i), searchEngineIndex);
+        }
+        TemplateUrl divider = new TemplateUrl(-1, "", "", false);

[Ian Wen, 2016/09/27 04:42:00]

Oops this is wrong. Don't do it. What will happen if the user clicks on the
title? Let's not add fake template urls to the model.

I believe what you should do is simply in getCount(), return
mSearchEngines.size() + 1.

If you are not sure, check out BookmarkDrawerListViewAdapter.

[ltian, 2016/09/28 19:19:46]

Done.

+        divider.setTemplateUrlType(TemplateUrlType.DIVIDER);
+        mSearchEngines.add(divider);
+        Collections.sort(mSearchEngines);
+
         // Convert the TemplateUrl index into an index into mSearchEngines.
         mSelectedSearchEnginePosition = -1;
         for (int i = 0; i < mSearchEngines.size(); ++i) {
             if (mSearchEngines.get(i).getIndex() == searchEngineIndex) {
                 mSelectedSearchEnginePosition = i;
             }
         }
 
         // Report back what is selected.
         mCallback.currentSearchEngineDetermined(toIndex(mSelectedSearchEnginePosition));
     }
 
+    private void setSearchEngineType(TemplateUrl templateUrl, int searchEngineIndex) {

[Ian Wen, 2016/09/27 04:42:00]

The adapter shouldn't be responsible for setting the type of the template url.
This value should already have been set up during construction.

[ltian, 2016/09/28 19:19:46]

Done.

+        if (templateUrl.getIsPrepopulated()) {
+            templateUrl.setTemplateUrlType(TemplateUrlType.PREPOPULATED);
+        } else if (templateUrl.getIndex() == searchEngineIndex) {
+            templateUrl.setTemplateUrlType(TemplateUrlType.DEFAULT);
+        } else {
+            templateUrl.setTemplateUrlType(TemplateUrlType.CUSTOM);
+        }
+    }
+
     private int toIndex(int position) {
         return mSearchEngines.get(position).getIndex();
     }
 
     // BaseAdapter:
 
     @Override
     public int getCount() {
         return mSearchEngines.size();
     }
 
     @Override
     public Object getItem(int pos) {
         TemplateUrl templateUrl = mSearchEngines.get(pos);
         return templateUrl.getShortName();
     }
 
     @Override
     public long getItemId(int position) {
         return position;
     }
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         View view = convertView;
+        TemplateUrl templateUrl = mSearchEngines.get(position);
         if (convertView == null) {
-            view = mLayoutInflater.inflate(R.layout.search_engine, null);
+            if (templateUrl.getTemplateUrlType() == TemplateUrlType.DIVIDER) {
+                view = mLayoutInflater.inflate(R.layout.search_engine_divider, null);
+            } else {
+                view = mLayoutInflater.inflate(R.layout.search_engine, null);
+            }
+        }
+
+        if (templateUrl.getTemplateUrlType() == TemplateUrlType.DIVIDER) {
+            view.setOnClickListener(null);
+            view.setEnabled(false);
+            return view;
         }
 
         view.setOnClickListener(this);
         view.setTag(position);
 
         // TODO(finnur): There's a tinting bug in the AppCompat lib (see http://crbug.com/474695),
         // which causes the first radiobox to always appear selected, even if it is not. It is being
         // addressed, but in the meantime we should use the native RadioButton instead.
         RadioButton radioButton = (RadioButton) view.findViewById(R.id.radiobutton);
         // On Lollipop this removes the redundant animation ring on selection but on older versions
         // it would cause the radio button to disappear.
         // TODO(finnur): Remove the encompassing if statement once we go back to using the AppCompat
         // control.
         final boolean selected = position == mSelectedSearchEnginePosition;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             radioButton.setBackgroundResource(0);
         }
         radioButton.setChecked(selected);
 
         TextView description = (TextView) view.findViewById(R.id.description);
-        TemplateUrl templateUrl = mSearchEngines.get(position);
         Resources resources = mContext.getResources();
         description.setText(templateUrl.getShortName());
 
+        TextView url = (TextView) view.findViewById(R.id.url);
+        url.setText(templateUrl.getUrl());
+        if (templateUrl.getTemplateUrlType() == TemplateUrlType.PREPOPULATED
+                || templateUrl.getUrl().length() == 0) {
+            url.setVisibility(View.GONE);
+        }
+
         // To improve the explore-by-touch experience, the radio button is hidden from accessibility
         // and instead, "checked" or "not checked" is read along with the search engine's name, e.g.
         // "google.com checked" or "google.com not checked".
         radioButton.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
         description.setAccessibilityDelegate(new AccessibilityDelegate() {
             @Override
             public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
                 super.onInitializeAccessibilityEvent(host, event);
                 event.setChecked(selected);
             }
@@ skipping 97 matching lines @@
                 toIndex(position));
         GeolocationInfo locationSettings = new GeolocationInfo(url, null, false);
         ContentSetting locationPermission = locationSettings.getContentSetting();
         // Handle the case where the geoHeader being sent when no permission has been specified.
         if (locationPermission == ContentSetting.ASK && checkGeoHeader) {
             return GeolocationHeader.isGeoHeaderEnabledForUrl(mContext, url, false);
         }
         return locationPermission == ContentSetting.ALLOW;
     }
 }