chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java - Issue 2367373003: [Android] Allow setting recently visited search engines as default search engine

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java

Issue 2367373003: [Android] Allow setting recently visited search engines as default search engine (Closed)

Patch Set: remove unnecessary changes. Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« chrome/android/java/res/layout/search_engine_recent_title.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java » ('j') | chrome/browser/search_engines/template_url_service_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java

index 792ea9b31ae8182bf99982129943194274e2f44c..1949b98ed716e4b8e852cd008db325ec4a421a65 100644

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

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

@@ -25,7 +25,9 @@ import android.widget.TextView;

import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.ContextUtils;

+import org.chromium.base.metrics.RecordUserAction;

import org.chromium.chrome.R;

+import org.chromium.chrome.browser.locale.LocaleManager;

import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;

import org.chromium.chrome.browser.preferences.website.ContentSetting;

import org.chromium.chrome.browser.preferences.website.GeolocationInfo;

@@ -38,6 +40,7 @@ import org.chromium.components.location.LocationUtils;

import org.chromium.ui.text.SpanApplier;

import org.chromium.ui.text.SpanApplier.SpanInfo;

+import java.util.ArrayList;

import java.util.List;

/**

@@ -53,7 +56,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

* one.

* @param name Provides the name of it (with a simplified URL in parenthesis).

- void currentSearchEngineDetermined(int selectedIndex);

+ void currentSearchEngineDetermined(String keyword);

}

// The current context.

@@ -65,15 +68,21 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

// The callback to use for notifying caller of progress.

private SelectSearchEngineCallback mCallback;

- // The list of available search engines.

- private List<TemplateUrl> mSearchEngines;

- // The position (index into mSearchEngines) of the currently selected search engine. Can be -1

+ // The list of prepopluated and default search engines.

+ private List<TemplateUrl> mPrepopulatedSearchEngines = new ArrayList<TemplateUrl>();

+ // The list of recently visited search engines.

+ private List<TemplateUrl> mRecentVisitedSearchEngines = new ArrayList<TemplateUrl>();

+ // The position (index into mPrepopulatedSearchEngines) of the currently selected search engine.

+ // Can be -1

// if current search engine is managed and set to something other than the pre-populated values.

private int mSelectedSearchEnginePosition = -1;

// The position of the default search engine before user's action.

private int mInitialEnginePosition = -1;

+ static final int VIEW_TYPE_ITEM = 0;

Ian Wen 2016/10/17 23:32:21 1. If this variable is not used by other classes i

ltian 2016/10/18 01:01:55 Done.

+ static final int VIEW_TYPE_DIVIDER = 1;

/**

* Construct a SearchEngineAdapter.

* @param context The current context.

@@ -88,21 +97,18 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

initEntries();

}

- /**

- * @return The index of the selected engine before user's action.

- */

- public int getInitialSearchEnginePosition() {

- return mInitialEnginePosition;

- }

// Used for testing.

String getValueForTesting() {

return Integer.toString(mSelectedSearchEnginePosition);

}

- void setValueForTesting(String value) {

- searchEngineSelected(Integer.parseInt(value));

+ String setValueForTesting(String value) {

+ return searchEngineSelected(Integer.parseInt(value));

+ }

+ String getKeywordFromIndex(int index) {

Ian Wen 2016/10/17 23:32:21 Rename it to getKeywordForTesting() ?

ltian 2016/10/18 01:01:55 Done.

+ return toKeyword(index);

}

/**

@@ -116,37 +122,67 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

return; // Flow continues in onTemplateUrlServiceLoaded below.

}

- // Fetch all the search engine info and the currently active one.

- mSearchEngines = templateUrlService.getLocalizedSearchEngines();

- int searchEngineIndex = templateUrlService.getDefaultSearchEngineIndex();

+ int defaultSearchEngineIndex = templateUrlService.getDefaultSearchEngineIndex();

+ /**

+ * Fetch all the search engine info and the currently active one, based on their types,

+ * add into different lists.

Ian Wen 2016/10/17 23:32:21 Inner comments should start with //

ltian 2016/10/18 01:01:55 Done.

+ */

+ for (TemplateUrl templateUrl : templateUrlService.getLocalizedSearchEngines()) {

+ if (templateUrl.getType() == TemplateUrlService.TYPE_PREPOPULATED

+ || templateUrl.getType() == TemplateUrlService.TYPE_DEFAULT) {

+ mPrepopulatedSearchEngines.add(templateUrl);

+ } else {

+ mRecentVisitedSearchEngines.add(templateUrl);

+ }

// Convert the TemplateUrl index into an index into mSearchEngines.

Ian Wen 2016/10/17 23:32:21 an index *of* mSearchEngines.

ltian 2016/10/18 01:01:55 Done.

mSelectedSearchEnginePosition = -1;

- for (int i = 0; i < mSearchEngines.size(); ++i) {

- if (mSearchEngines.get(i).getIndex() == searchEngineIndex) {

+ for (int i = 0; i < mPrepopulatedSearchEngines.size(); ++i) {

+ if (mPrepopulatedSearchEngines.get(i).getIndex() == defaultSearchEngineIndex) {

mSelectedSearchEnginePosition = i;

}

+ for (int i = 0; i < mRecentVisitedSearchEngines.size(); ++i) {

+ if (mRecentVisitedSearchEngines.get(i).getIndex() == defaultSearchEngineIndex) {

+ mSelectedSearchEnginePosition = i + mPrepopulatedSearchEngines.size() + 1;

+ }

mInitialEnginePosition = mSelectedSearchEnginePosition;

// Report back what is selected.

- mCallback.currentSearchEngineDetermined(toIndex(mSelectedSearchEnginePosition));

+ mCallback.currentSearchEngineDetermined(toKeyword(mSelectedSearchEnginePosition));

}

- private int toIndex(int position) {

- return mSearchEngines.get(position).getIndex();

+ private String toKeyword(int position) {

+ if (position < mPrepopulatedSearchEngines.size()) {

+ return mPrepopulatedSearchEngines.get(position).getKeyword();

+ } else {

+ position -= mPrepopulatedSearchEngines.size() + 1;

+ return mRecentVisitedSearchEngines.get(position).getKeyword();

+ }

}

// BaseAdapter:

@Override

public int getCount() {

- return mSearchEngines == null ? 0 : mSearchEngines.size();

+ return mPrepopulatedSearchEngines == null

+ ? 0

+ : mPrepopulatedSearchEngines.size() + mRecentVisitedSearchEngines.size() + 1;

}

@Override

public Object getItem(int pos) {

- TemplateUrl templateUrl = mSearchEngines.get(pos);

- return templateUrl.getShortName();

+ if (pos < mPrepopulatedSearchEngines.size()) {

+ return mPrepopulatedSearchEngines.get(pos);

+ } else if (pos > mPrepopulatedSearchEngines.size()) {

+ pos -= mPrepopulatedSearchEngines.size() + 1;

+ return mRecentVisitedSearchEngines.get(pos);

+ }

+ return null;

}

@Override

@@ -155,11 +191,29 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

}

@Override

+ public int getItemViewType(int position) {

+ if (position == mPrepopulatedSearchEngines.size()) {

+ return VIEW_TYPE_DIVIDER;

+ } else {

+ return VIEW_TYPE_ITEM;

+ }

+ @Override

public View getView(int position, View convertView, ViewGroup parent) {

View view = convertView;

- if (convertView == null) {

+ TemplateUrl templateUrl = (TemplateUrl) getItem(position);

+ int itemViewType = getItemViewType(position);

+ if (itemViewType == VIEW_TYPE_DIVIDER) {

+ view = mLayoutInflater.inflate(R.layout.search_engine_recent_title, null);

+ } else {

view = mLayoutInflater.inflate(R.layout.search_engine, null);

}

+ if (itemViewType == VIEW_TYPE_DIVIDER) {

+ view.setOnClickListener(null);

+ view.setEnabled(false);

+ return view;

+ }

view.setOnClickListener(this);

view.setTag(position);

@@ -179,10 +233,17 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

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.getType() == TemplateUrlService.TYPE_PREPOPULATED

+ || templateUrl.getType() == TemplateUrlService.TYPE_DEFAULT

+ || 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".

@@ -247,7 +308,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

}

- private void searchEngineSelected(int position) {

+ private String searchEngineSelected(int position) {

// First clean up any automatically added permissions (if any) for the previously selected

// search engine.

SharedPreferences sharedPreferences =

@@ -255,7 +316,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

if (sharedPreferences.getBoolean(PrefServiceBridge.LOCATION_AUTO_ALLOWED, false)) {

if (locationEnabled(mSelectedSearchEnginePosition, false)) {

String url = TemplateUrlService.getInstance().getSearchEngineUrlFromTemplateUrl(

- toIndex(mSelectedSearchEnginePosition));

+ toKeyword(mSelectedSearchEnginePosition));

WebsitePreferenceBridge.nativeSetGeolocationSettingForOrigin(

url, url, ContentSetting.DEFAULT.toInt(), false);

}

@@ -265,10 +326,18 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

// Record the change in search engine.

mSelectedSearchEnginePosition = position;

+ String keyword = toKeyword(mSelectedSearchEnginePosition);

// Report the change back.

- mCallback.currentSearchEngineDetermined(toIndex(mSelectedSearchEnginePosition));

+ mCallback.currentSearchEngineDetermined(keyword);

+ // If the user has manually set the default search engine, disable auto switching.

+ boolean manualSwitch = mSelectedSearchEnginePosition != mInitialEnginePosition;

+ if (manualSwitch) {

+ RecordUserAction.record("SearchEngine_ManualChange");

+ LocaleManager.getInstance().setSearchEngineAutoSwitch(false);

+ }

notifyDataSetChanged();

+ return keyword;

}

private void onLocationLinkClicked() {

@@ -278,7 +347,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

Intent settingsIntent = PreferencesLauncher.createIntentForSettingsPage(

mContext, SingleWebsitePreferences.class.getName());

String url = TemplateUrlService.getInstance().getSearchEngineUrlFromTemplateUrl(

- toIndex(mSelectedSearchEnginePosition));

+ toKeyword(mSelectedSearchEnginePosition));

Bundle fragmentArgs = SingleWebsitePreferences.createFragmentArgsForSite(url);

fragmentArgs.putBoolean(SingleWebsitePreferences.EXTRA_LOCATION,

locationEnabled(mSelectedSearchEnginePosition, true));

@@ -291,7 +360,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On

if (position == -1) return false;

String url = TemplateUrlService.getInstance().getSearchEngineUrlFromTemplateUrl(

- toIndex(position));

+ toKeyword(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.