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

chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

 // Copyright 2013 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.search_engines;
 
 import android.text.TextUtils;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Android wrapper of the TemplateUrlService which provides access from the Java
  * layer.
  *
  * Only usable from the UI thread as it's primary purpose is for supporting the Android
  * preferences UI.
  *
  * See components/search_engines/template_url_service.h for more details.
  */
@@ skipping 10 matching lines @@
      * Observer to be notified whenever the set of TemplateURLs are modified.
      */
     public interface TemplateUrlServiceObserver {
         /**
          * Notification that the template url model has changed in some way.
          */
         void onTemplateURLServiceChanged();
     }
 
     /**
+     * Type to sort & display different layouts for different type of search engines.
+     */
+    public enum TemplateUrlType {

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

Let's use ints instead of enums.
https://developer.android.com/training/articles/memory.html#Overhead

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

Done.

+        PREPOPULATED,
+        /**
+         * Type for default search engine which is not prepopulated. This is needed because
+         * if a custom search engine is set as default, it will move to default list.
+         */
+        DEFAULT,
+        /**
+         * Type to identify divdier view.
+         */
+        DIVIDER,

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

Remove DIVIDER

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

Done.

+        CUSTOM

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

I wouldn't use the term "custom" here, as the list you are showing is not
customizable. You might want to rephrase it to "recent"

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

Done.

+    }
+
+    /**
      * Represents search engine with its index.
      */
-    public static class TemplateUrl {
+    public static class TemplateUrl implements Comparable<TemplateUrl> {
         private final int mIndex;
         private final String mShortName;
-        private boolean mIsPrepopulated;
+        private final String mUrl;
+        private final boolean mIsPrepopulated;
+        private TemplateUrlType mTemplateUrlType;
 
         @CalledByNative("TemplateUrl")
-        public static TemplateUrl create(int id, String shortName, boolean isPrepopulated) {
-            return new TemplateUrl(id, shortName, isPrepopulated);
+        public static TemplateUrl create(
+                int id, String shortName, String url, boolean isPrepopulated) {
+            return new TemplateUrl(id, shortName, url, isPrepopulated);
         }
 
-        public TemplateUrl(int index, String shortName, boolean isPrepopulated) {
+        public TemplateUrl(int index, String shortName, String url, boolean isPrepopulated) {
             mIndex = index;
             mShortName = shortName;
+            Pattern pattern = Pattern.compile("[^/]+.com");
+            Matcher m = pattern.matcher(url);
+            if (!m.find()) {
+                mUrl = "";
+            } else {
+                mUrl = m.group(0);
+            }
             mIsPrepopulated = isPrepopulated;
         }
 
         public int getIndex() {
             return mIndex;
         }
 
         public String getShortName() {
             return mShortName;
         }
 
+        public String getUrl() {
+            return mUrl;
+        }
+
+        public boolean getIsPrepopulated() {

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

Instead of creating this method, you could create a method called getType, and
return an integer. Later users of this class will know if it is a recent, or
prepopulated, or default.

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

Done.

+            return mIsPrepopulated;
+        }
+
+        public void setTemplateUrlType(TemplateUrlType templateUrlType) {
+            mTemplateUrlType = templateUrlType;
+        }
+
+        public TemplateUrlType getTemplateUrlType() {
+            return mTemplateUrlType;
+        }
+
         @Override
         public int hashCode() {
             final int prime = 31;
             int result = 1;
             result = prime * result + mIndex;
             result = prime * result + ((mShortName == null) ? 0 : mShortName.hashCode());
             return result;
         }
 
         @Override
         public boolean equals(Object other) {
             if (!(other instanceof TemplateUrl)) return false;
             TemplateUrl otherTemplateUrl = (TemplateUrl) other;
             return mIndex == otherTemplateUrl.mIndex
                     && TextUtils.equals(mShortName, otherTemplateUrl.mShortName);
         }
+
+        @Override
+        public int compareTo(TemplateUrl templateUrl) {

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

Q: why adding this?

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

Done.

+            return mTemplateUrlType.compareTo(templateUrl.getTemplateUrlType());
+        }
     }
 
     private static TemplateUrlService sService;
 
     public static TemplateUrlService getInstance() {
         ThreadUtils.assertOnUiThread();
         if (sService == null) {
             sService = new TemplateUrlService();
         }
         return sService;
@@ skipping 26 matching lines @@
      * Warning: TemplateUrl.getIndex() is *not* an index into this list, since this list contains
      * only prepopulated search engines. E.g. getLocalizedSearchEngines().get(0).getIndex() could
      * return 3.
      */
     public List<TemplateUrl> getLocalizedSearchEngines() {
         ThreadUtils.assertOnUiThread();
         int templateUrlCount = nativeGetTemplateUrlCount(mNativeTemplateUrlServiceAndroid);
         List<TemplateUrl> templateUrls = new ArrayList<TemplateUrl>(templateUrlCount);
         for (int i = 0; i < templateUrlCount; i++) {
             TemplateUrl templateUrl = nativeGetTemplateUrlAt(mNativeTemplateUrlServiceAndroid, i);
-            if (templateUrl != null && templateUrl.mIsPrepopulated) {
+            if (templateUrl != null) {
                 templateUrls.add(templateUrl);
             }
         }
         return templateUrls;
     }
 
     /**
      * Called from native when template URL service is done loading.
      */
     @CalledByNative
@@ skipping 172 matching lines @@
             String query);
     private native String nativeGetUrlForVoiceSearchQuery(long nativeTemplateUrlServiceAndroid,
             String query);
     private native String nativeReplaceSearchTermsInUrl(long nativeTemplateUrlServiceAndroid,
             String query, String currentUrl);
     private native String nativeGetUrlForContextualSearchQuery(long nativeTemplateUrlServiceAndroid,
             String query, String alternateTerm, boolean shouldPrefetch, String protocolVersion);
     private native String nativeGetSearchEngineUrlFromTemplateUrl(
             long nativeTemplateUrlServiceAndroid, int index);
 }