GitLab

Also fix a few NPEs from the UrlData change.

* changes:
  Squashed commit of the following:

commit a81c695597665c0bae7e0af2ab98bf0d7ef96cbc
Author: Mitsuru Oshima <oshima@google.com>
Date:   Wed Jun 10 14:45:55 2009 -0700

    * added inline scheme support that shows content using WebKit#loadDataWithURL
    * removed data scheme from manifest

Merge commit 'e20c4a40' into donut

* commit 'e20c4a40':
  AI 149721: Import Portuguese translations.

Automated import of CL 149721

* changes:
  Update browser icons - possibly not final.

* changes:
  Remove test library and instrumentation defs from Browser.

See bug 1900802.

The monkey crashed because getTopWindow() returned null.
Ensure that we either have a top window, or we are in
the tab picker.  If neither is true, return false, to
avoid the null pointer exception.

* changes:
  Change the default client id for better stats

Without this inclusion, the web search detection code thought that URLs
of the format about:blank or about:debug were web searches and passed
them on to the search provider.

We used to use the original url because that was what was entered into the
history database. Now, with a change in webkit, the correct url will be passed
to updateVisitedHistory if the server sent a redirect. This allows for the
correct url and title to be displayed in the title bar as well as the correct
url and title to be stored in the history.

- Web search was hard coded to Google and suggestions in the search dialog were hard coded to the GoogleSearch suggest provider package. Both now point to the system default web search/suggest provider which can include third party search engines.
- I also removed the intent filter to handle action.WEB_SEARCH from the browser because it should no longer provide web search functionality for other apps, that feature is provided by the recently added WebSearchProvider package. Removing this intent filter also removes the browser from the list of web search providers in the system settings.
- As part of this change I had to factor out the search shortcut code to a separate function, add a couple of new functions and modify the browser provider code to access cursor fields in a safe manner.

"Bookmarks & history" to "Browser".

Fix #1722851. Move the Browser's default home page to the resource so that we can localize it easily.

(dependent on change 1691, and will not submit until that is
submitted).

should still stay the same (i.e., query in title, number of results in
subtitle).

Also update all url subtitles to be green text as per search UI standards.

And change the text of "Search Google" to "Search the web" to accommodate
upcoming choices of web search provider.

shows as the first line and the url shows as the second line. Preceding
"http://" is stripped from urls. If the first line would be empty or
whitespace, the second line is promoted to the first line.

This affects suggestions both for the browser and for global search. I
thought this looked a lot better so ran it by Leland and he's cool with
this.

I went ahead and reused the raw int values being used for column indices
and such, but this is bad. You guys should really consider making this
code a little safer/cleaner. :)

* changes:
  Update google_search_base for chinese language.

Changed default search base for china to be www.google.cn and changed the language param.

This will allow bookmarks+history suggestions to show
up in global search without having it hard-coded
in GlobalSearch.SuggestionSources.

Merge commit 'a6911fcc' into donut

* commit 'a6911fcc':
  AI 148147: Import lots of zh_TW translation changes.

Automated import of CL 148147

Merge commit '9ebc0f08' into donut

* commit '9ebc0f08':
  AI 148026: Update zh_TW translations.

Automated import of CL 148026

The existing icons for bookmarks, history and search suggestions
in the browser are quite small and don't match the search suggestion
icons used in the rest of the system.

This activity is never started from the browser. Its purpose
is to provide bookmark suggestions to global search (through
its searchable meta-data), and to handle the intents produced
by clicking such suggestions.

While I was working on BrowserProvider, I noticed some unused and
incorrecly ordered imports.

The browser returns bookmarks+history, and pads with
google search suggest, when search suggestions are
requested using content://browser/search_suggest_query
This patch adds a new URI
content://browser/bookmarks/search_suggest_query
that only returns bookmarks+history.

Before, the BrowserProvider talked directly to the
SearchManagerService and implemented its own version of
the SearchManager code for getting search suggestions.
This breaks if the global search provider is not
GoogleSearch.

This patch changes BrowserProvider to instead use
the SearchManager API to get suggestions from
the GoogleSearch application. When we have support
for third-party web search providers, this should be
changed to use the selected web search provider.

Merge commit '94d2163d' into donut

* commit '94d2163d':
  AI 147962: Import updated zh_TW translations.

Merge commit '09c51792' into donut

* commit '09c51792':
  AI 147492: Update zh_TW translations.

Automated import of CL 147962

I removed this by accident when removing the clearPictureListeners method. This
fixes a NPE when touching a removed tab in the tab picker.

BUG=1816205