OSDN Git Service

android-x86/packages-apps-Browser.git
14 years agoLogging page load time
Kristian Monsen [Tue, 2 Feb 2010 13:37:09 +0000 (13:37 +0000)]
Logging page load time

Added a log message when a page is loaded. It will handle redirects as a new page load.

14 years agoUse the constants defined in RecognizerResultsIntent for voice search.
Leon Scroggins [Mon, 1 Feb 2010 21:14:11 +0000 (16:14 -0500)]
Use the constants defined in RecognizerResultsIntent for voice search.

14 years agoLog when bookmarks are added
Kristian Monsen [Mon, 1 Feb 2010 18:41:07 +0000 (18:41 +0000)]
Log when bookmarks are added

Log when the user add a bookmark, sending the url of the bookmark and how the bookmark was added

14 years agoHandle the voice search intent.
Leon Scroggins [Thu, 28 Jan 2010 20:12:40 +0000 (15:12 -0500)]
Handle the voice search intent.

Once the voice search intent has been handled, the title bar
background changes to green, and touching it displays other voice
search possibilities.

Fixes http://b/issue?id=2390686

14 years agoroll MR3 stretchy changes into master
Mike Reed [Fri, 29 Jan 2010 16:31:39 +0000 (11:31 -0500)]
roll MR3 stretchy changes into master

14 years agoMove the "Search web ..." to the first in the
Grace Kloba [Thu, 28 Jan 2010 19:44:38 +0000 (11:44 -0800)]
Move the "Search web ..." to the first in the
suggestion list.

http://b/issue?id=2314166

14 years agoShould trust my own code
Grace Kloba [Thu, 28 Jan 2010 19:39:15 +0000 (11:39 -0800)]
Should trust my own code

14 years agoMerge "Demo widget using the UrlRendererService for server-side rendering of urls."
Patrick Scott [Thu, 28 Jan 2010 19:18:01 +0000 (11:18 -0800)]
Merge "Demo widget using the UrlRendererService for server-side rendering of urls."

14 years agoDemo widget using the UrlRendererService for server-side rendering of urls.
Patrick Scott [Tue, 8 Dec 2009 13:51:33 +0000 (08:51 -0500)]
Demo widget using the UrlRendererService for server-side rendering of urls.

14 years agoam 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy, but leave the support code...
Mike Reed [Thu, 28 Jan 2010 18:47:03 +0000 (10:47 -0800)]
am 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy, but leave the support code around for now

Merge commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae'

* commit '5b739d8102982d24924aae0dbbb74b9fbc1c46ae':
  disable mr stretchy, but leave the support code around for now

14 years agoMerge "Use a single EXTRA_HEADERS intent."
Grace Kloba [Thu, 28 Jan 2010 17:24:58 +0000 (09:24 -0800)]
Merge "Use a single EXTRA_HEADERS intent."

14 years agoUse a single EXTRA_HEADERS intent.
Grace Kloba [Wed, 27 Jan 2010 22:53:51 +0000 (14:53 -0800)]
Use a single EXTRA_HEADERS intent.

14 years agoFix a legit crash that the monkey found.
Patrick Scott [Wed, 27 Jan 2010 21:39:11 +0000 (16:39 -0500)]
Fix a legit crash that the monkey found.

If the device is running low on memory, the Browser may free background tabs.
removeTab could potentially remove a tab that has a lower index than the current
tab. That would cause mCurrentTab to point to the incorrect tab. Update
mCurrentTab if that is the case so it is pointing to the correct index.

Bug: 2371002

14 years agoAdd request header support for the Browser/WebView.
Grace Kloba [Wed, 27 Jan 2010 02:11:27 +0000 (18:11 -0800)]
Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.

Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.

Remove "inline:" as no one is using it and it is a
hidden feature.

Part 2 of 3-project checkin.

14 years agouse the very private API
Jean-Baptiste Queru [Wed, 27 Jan 2010 00:01:52 +0000 (16:01 -0800)]
use the very private API

Change-Id: Ife7e8a69878e96b6c659d5eb66aa3f386b84f26c

14 years agoMerge "Adding Chinese GBK and Big5 text encoding settings."
Eugene Koh [Tue, 26 Jan 2010 23:01:02 +0000 (15:01 -0800)]
Merge "Adding Chinese GBK and Big5  text encoding settings."

14 years agoconditional code to test the browser in 32bit
Mike Reed [Tue, 26 Jan 2010 20:21:44 +0000 (15:21 -0500)]
conditional code to test the browser in 32bit

14 years agoAdding Chinese GBK and Big5 text encoding settings.
Bai Tao [Tue, 26 Jan 2010 18:25:09 +0000 (02:25 +0800)]
Adding Chinese GBK and Big5  text encoding settings.

14 years agoam 8fa17c4f: (-s ours) am 79f107bd: Do not merge
Mike Reed [Tue, 26 Jan 2010 07:34:43 +0000 (23:34 -0800)]
am 8fa17c4f: (-s ours) am 79f107bd: Do not merge

Merge commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c'

* commit '8fa17c4f225590d9dbe59b813a5054a506b3f19c':
  Do not merge

14 years agoam 15eb5b56: (-s ours) am 474429d0: Do not merge
Mike Reed [Tue, 26 Jan 2010 02:11:52 +0000 (18:11 -0800)]
am 15eb5b56: (-s ours) am 474429d0: Do not merge

Merge commit '15eb5b562b10f293bc5de162075895b54400f684'

* commit '15eb5b562b10f293bc5de162075895b54400f684':
  Do not merge

14 years agoAlways show the voice search button in the browser title bar when in voice search...
Leon Scroggins [Mon, 25 Jan 2010 15:40:38 +0000 (10:40 -0500)]
Always show the voice search button in the browser title bar when in voice search mode.

Fix for http://b/issue?id=2390704

14 years agoam 3d3c1985: disable mr stretchy, but leave the support code around for now
Mike Reed [Fri, 22 Jan 2010 20:55:57 +0000 (12:55 -0800)]
am 3d3c1985: disable mr stretchy, but leave the support code around for now

Merge commit '3d3c198547122e52708140dc2ed10e1d4d8358da' into eclair-plus-aosp

* commit '3d3c198547122e52708140dc2ed10e1d4d8358da':
  disable mr stretchy, but leave the support code around for now

14 years agodisable mr stretchy, but leave the support code around for now
Mike Reed [Fri, 22 Jan 2010 20:34:37 +0000 (15:34 -0500)]
disable mr stretchy, but leave the support code around for now

14 years agoMerge "Use the common method for updating the title."
Leon Scroggins [Fri, 22 Jan 2010 13:38:59 +0000 (05:38 -0800)]
Merge "Use the common method for updating the title."

14 years agorelocate GoogleLoginService
Doug Zongker [Thu, 21 Jan 2010 22:35:23 +0000 (14:35 -0800)]
relocate GoogleLoginService

Change-Id: Ie5a1770b8bb3adaeb9dce1db89e0b563519fde0a

14 years agoUse the common method for updating the title.
Leon Scroggins [Thu, 21 Jan 2010 21:25:26 +0000 (16:25 -0500)]
Use the common method for updating the title.

Depends on a change in frameworks/base

14 years agoChange the error message when attempting to open a file that cannot be opened.
Leon Scroggins [Thu, 21 Jan 2010 21:17:56 +0000 (16:17 -0500)]
Change the error message when attempting to open a file that cannot be opened.

Previously, a file that could not be opened had to be a failed download.
Now that we allow the download of files which cannot be opened, we need
a different error message when attempting to open them.

14 years agoMerge "Do not show the downloads page without the user explicitly requesting it."
Leon Scroggins [Thu, 21 Jan 2010 17:53:49 +0000 (09:53 -0800)]
Merge "Do not show the downloads page without the user explicitly requesting it."

14 years agoRemove the option to clear all downloads.
Leon Scroggins [Thu, 21 Jan 2010 15:05:59 +0000 (10:05 -0500)]
Remove the option to clear all downloads.

Clearing all downloads would remove completed downloads from the
list, while leaving them on the SD card, and there would not
necessarily be a way to delete them using the phone.

14 years agoam 79f107bd: Do not merge
Mike Reed [Thu, 21 Jan 2010 16:07:22 +0000 (08:07 -0800)]
am 79f107bd: Do not merge

Merge commit '79f107bdb2c509abb02cfca92ca9dba6187282bc' into eclair-plus-aosp

* commit '79f107bdb2c509abb02cfca92ca9dba6187282bc':
  Do not merge

14 years agoDo not show the downloads page without the user explicitly requesting it.
Leon Scroggins [Thu, 21 Jan 2010 14:27:46 +0000 (09:27 -0500)]
Do not show the downloads page without the user explicitly requesting it.

Fixes http://b/issue?id=1671150

14 years agoReplace clearing an item from the downloads list with deleting the item.
Leon Scroggins [Thu, 14 Jan 2010 20:44:06 +0000 (15:44 -0500)]
Replace clearing an item from the downloads list with deleting the item.

Fix for http://b/issue?id=2367238

14 years agoDo not merge
Mike Reed [Thu, 21 Jan 2010 03:24:55 +0000 (22:24 -0500)]
Do not merge

use larger 16x16 asset, reduce pull a little bit

14 years agoam 474429d0: Do not merge
Mike Reed [Thu, 21 Jan 2010 02:35:18 +0000 (18:35 -0800)]
am 474429d0: Do not merge

Merge commit '474429d099342fb0ad4959d59e05b764b96c2bb0' into eclair-plus-aosp

* commit '474429d099342fb0ad4959d59e05b764b96c2bb0':
  Do not merge

14 years agoDo not merge
Mike Reed [Wed, 20 Jan 2010 14:40:28 +0000 (09:40 -0500)]
Do not merge

port stretchy from master
add pattern bg for effect #2

14 years agoAdd data (title, screenshot, favicon) to share intent.
Leon Scroggins [Thu, 10 Dec 2009 17:35:56 +0000 (12:35 -0500)]
Add data (title, screenshot, favicon) to share intent.

Requires a change to frameworks/base

Fixes http://b/issue?id=2243246

14 years agoDetect if the current network is wifi or not and update webkit.
Andrei Popescu [Tue, 12 Jan 2010 22:39:16 +0000 (22:39 +0000)]
Detect if the current network is wifi or not and update webkit.
This info is passed to youtube.com via a custom HTTP header.

Fixes b:2368650

14 years agoUse the private Download Manager APIs.
Jean-Baptiste Queru [Fri, 15 Jan 2010 00:09:03 +0000 (16:09 -0800)]
Use the private Download Manager APIs.

This boils down to using Downloads.Impl instead of Downloads

The APIs that were being used so far are going to disappear
to be replaced by a new set of APIs, but in order for the browser
to be able to continue using the old APIs a new copy of those APIs
was created "on the side" so that the browser doesn't need to
change much.

Bug: 2245521

Change-Id: I33c526331cce006710b1f934a4aeb64cdb95d62e

14 years agoMerge "Added framework for logging"
Kristian Monsen [Fri, 15 Jan 2010 02:42:00 +0000 (18:42 -0800)]
Merge "Added framework for logging"

14 years agoAdded framework for logging
kristianm [Fri, 15 Jan 2010 01:14:07 +0000 (17:14 -0800)]
Added framework for logging

Startet on logging from the browser. This commit is just the tools
for logging, nothing is being logged yet.

14 years agoenable stretch[1] by default
Mike Reed [Thu, 14 Jan 2010 22:57:45 +0000 (14:57 -0800)]
enable stretch[1] by default

14 years agorefactor draghandler dispatch in about:debug.drag#
Mike Reed [Wed, 13 Jan 2010 22:40:52 +0000 (14:40 -0800)]
refactor draghandler dispatch in about:debug.drag#

14 years agoresolved conflicts for merge of 444fde48 to master
Leon Scroggins [Wed, 13 Jan 2010 20:52:01 +0000 (15:52 -0500)]
resolved conflicts for merge of 444fde48 to master

14 years agoam 24837456: Show the downloads list divided into groups based on how recently downlo...
Leon Scroggins [Wed, 13 Jan 2010 20:24:01 +0000 (12:24 -0800)]
am 24837456: Show the downloads list divided into groups based on how recently downloaded.

Merge commit '2483745674f95f60b8c3b8c9e817f2df1776a0b5' into eclair-mr2-plus-aosp

* commit '2483745674f95f60b8c3b8c9e817f2df1776a0b5':
  Show the downloads list divided into groups based on how recently downloaded.

14 years agoShow the downloads list divided into groups based on how recently downloaded.
Leon Scroggins [Wed, 13 Jan 2010 18:43:35 +0000 (13:43 -0500)]
Show the downloads list divided into groups based on how recently downloaded.

Fixes http://b/issue?id=2367226

14 years agoresolved conflicts for merge of 66c429a8 to master
Leon Scroggins [Tue, 12 Jan 2010 23:02:29 +0000 (18:02 -0500)]
resolved conflicts for merge of 66c429a8 to master

14 years agoam a3935ac4: Merge "Move clustering functionality of HistoryAdapter to its own class...
Leon Scroggins [Tue, 12 Jan 2010 22:43:51 +0000 (14:43 -0800)]
am a3935ac4: Merge "Move clustering functionality of HistoryAdapter to its own class." into eclair-mr2

Merge commit 'a3935ac40ac3767b13c92b192a0eb69d837a4093' into eclair-mr2-plus-aosp

* commit 'a3935ac40ac3767b13c92b192a0eb69d837a4093':
  Move clustering functionality of HistoryAdapter to its own class.

14 years agoMerge "Move clustering functionality of HistoryAdapter to its own class." into eclair-mr2
Leon Scroggins [Tue, 12 Jan 2010 22:27:55 +0000 (14:27 -0800)]
Merge "Move clustering functionality of HistoryAdapter to its own class." into eclair-mr2

14 years agoMove clustering functionality of HistoryAdapter to its own class.
Leon Scroggins [Tue, 12 Jan 2010 20:15:11 +0000 (15:15 -0500)]
Move clustering functionality of HistoryAdapter to its own class.

This way it can be used by the BrowserDownloadsAdapter (in a
separate changelist) to fix http://b/issue?id=2367226

14 years agoam 4d569da2: am c7b92f81: Use a "boolean" instead of a "Boolean"
Leon Scroggins [Tue, 12 Jan 2010 15:24:03 +0000 (07:24 -0800)]
am 4d569da2: am c7b92f81: Use a "boolean" instead of a "Boolean"

Merge commit '4d569da292a8a371098461d0763edd1393cdc712'

* commit '4d569da292a8a371098461d0763edd1393cdc712':
  Use a "boolean" instead of a "Boolean"

14 years agoam c7b92f81: Use a "boolean" instead of a "Boolean"
Leon Scroggins [Tue, 12 Jan 2010 15:10:35 +0000 (07:10 -0800)]
am c7b92f81: Use a "boolean" instead of a "Boolean"

Merge commit 'c7b92f811dfa3572578ddc6714c98a03936d9ce5' into eclair-mr2-plus-aosp

* commit 'c7b92f811dfa3572578ddc6714c98a03936d9ce5':
  Use a "boolean" instead of a "Boolean"

14 years agoUse a "boolean" instead of a "Boolean"
Leon Scroggins [Mon, 11 Jan 2010 23:17:31 +0000 (18:17 -0500)]
Use a "boolean" instead of a "Boolean"

Fixes http://b/issue?id=1856681

14 years agoam 58c3d985: am fde9746a: Clear parent/child tab relationships when clearing history.
Leon Scroggins [Mon, 11 Jan 2010 18:20:53 +0000 (10:20 -0800)]
am 58c3d985: am fde9746a: Clear parent/child tab relationships when clearing history.

Merge commit '58c3d985682495d6563cafe21fa19a47ef349971'

* commit '58c3d985682495d6563cafe21fa19a47ef349971':
  Clear parent/child tab relationships when clearing history.

14 years agoam fde9746a: Clear parent/child tab relationships when clearing history.
Leon Scroggins [Mon, 11 Jan 2010 18:17:09 +0000 (10:17 -0800)]
am fde9746a: Clear parent/child tab relationships when clearing history.

Merge commit 'fde9746ac3055848e110c35f19ec5893c621f766' into eclair-mr2-plus-aosp

* commit 'fde9746ac3055848e110c35f19ec5893c621f766':
  Clear parent/child tab relationships when clearing history.

14 years agoClear parent/child tab relationships when clearing history.
Leon Scroggins [Mon, 11 Jan 2010 18:06:21 +0000 (13:06 -0500)]
Clear parent/child tab relationships when clearing history.

Fixes http://b/issue?id=2330279

14 years agoDeprecate fill_parent and introduce match_parent.
Romain Guy [Fri, 8 Jan 2010 23:06:43 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #2361749.

14 years agoenable drag-trackers via about:debug.dragN where N is
Mike Reed [Fri, 8 Jan 2010 15:31:53 +0000 (10:31 -0500)]
enable drag-trackers via about:debug.dragN where N is

0: no tracker (default)
1: variant 1
2: variant 2

14 years agoRemove onTooManyRedirects as it is deprecated.
Patrick Scott [Fri, 8 Jan 2010 15:06:45 +0000 (10:06 -0500)]
Remove onTooManyRedirects as it is deprecated.

14 years agoUse LIKE rather than GLOB since the url contains '?'.
Patrick Scott [Thu, 7 Jan 2010 20:01:09 +0000 (15:01 -0500)]
Use LIKE rather than GLOB since the url contains '?'.

Bug: 2271388

14 years agoMerge "switch to using AccountManager instead of GLS"
Fred Quintana [Wed, 6 Jan 2010 20:51:39 +0000 (12:51 -0800)]
Merge "switch to using AccountManager instead of GLS"

14 years agoDo not use a user tag on apps, as it is ignored.
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:21 +0000 (16:27 -0800)]
Do not use a user tag on apps, as it is ignored.

The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: Iddc3da158364849efa59c02bac7d821dc12cf02f

14 years agoam 4843fb8f: am 02065b07: Save to database in non UI thread.
Leon Scroggins [Mon, 4 Jan 2010 23:40:07 +0000 (15:40 -0800)]
am 4843fb8f: am 02065b07: Save to database in non UI thread.

Merge commit '4843fb8fbc68b500a039d7e8fb21d73eeaa77baa'

* commit '4843fb8fbc68b500a039d7e8fb21d73eeaa77baa':
  Save to database in non UI thread.

14 years agoam 02065b07: Save to database in non UI thread.
Leon Scroggins [Mon, 4 Jan 2010 21:37:38 +0000 (13:37 -0800)]
am 02065b07: Save to database in non UI thread.

Merge commit '02065b07aea6b4392c344a4172c3ab56019225ed' into eclair-mr2-plus-aosp

* commit '02065b07aea6b4392c344a4172c3ab56019225ed':
  Save to database in non UI thread.

14 years agoSave to database in non UI thread.
Leon Scroggins [Mon, 4 Jan 2010 19:30:13 +0000 (14:30 -0500)]
Save to database in non UI thread.

Work to prevent ANR reported in http://b/issue?id=2322540 category 1.

14 years agoswitch to using AccountManager instead of GLS
Fred Quintana [Fri, 18 Dec 2009 18:18:26 +0000 (10:18 -0800)]
switch to using AccountManager instead of GLS

14 years agoam 9f1a55b2: am 3b2b810a: Merge change Ife7f3f54 into eclair-mr2
Derek Sollenberger [Fri, 18 Dec 2009 17:59:15 +0000 (09:59 -0800)]
am 9f1a55b2: am 3b2b810a: Merge change Ife7f3f54 into eclair-mr2

Merge commit '9f1a55b21d05acc91d25fb0ff77089491af68dd8'

* commit '9f1a55b21d05acc91d25fb0ff77089491af68dd8':
  Explicitly requesting that the IME resize the WebView.

14 years agoam 42bf4dc3: am d5a80a52: add initial dragtrackers
Mike Reed [Fri, 18 Dec 2009 17:57:02 +0000 (09:57 -0800)]
am 42bf4dc3: am d5a80a52: add initial dragtrackers

Merge commit '42bf4dc36aa994a3f98c34a6db396ca1b7e7c578'

* commit '42bf4dc36aa994a3f98c34a6db396ca1b7e7c578':
  add initial dragtrackers

14 years agoam 3b2b810a: Merge change Ife7f3f54 into eclair-mr2
Derek Sollenberger [Fri, 18 Dec 2009 17:56:06 +0000 (09:56 -0800)]
am 3b2b810a: Merge change Ife7f3f54 into eclair-mr2

Merge commit '3b2b810a099b7bce65d18fc2a21ae17d78488eb0' into eclair-mr2-plus-aosp

* commit '3b2b810a099b7bce65d18fc2a21ae17d78488eb0':
  Explicitly requesting that the IME resize the WebView.

14 years agoam d5a80a52: add initial dragtrackers
Mike Reed [Fri, 18 Dec 2009 17:53:11 +0000 (09:53 -0800)]
am d5a80a52: add initial dragtrackers

Merge commit 'd5a80a5295438be18cfaebf197088d7c15f6d0ba' into eclair-mr2-plus-aosp

* commit 'd5a80a5295438be18cfaebf197088d7c15f6d0ba':
  add initial dragtrackers

14 years agoMerge change Ife7f3f54 into eclair-mr2
Android (Google) Code Review [Fri, 18 Dec 2009 17:53:04 +0000 (09:53 -0800)]
Merge change Ife7f3f54 into eclair-mr2

* changes:
  Explicitly requesting that the IME resize the WebView.

14 years agoExplicitly requesting that the IME resize the WebView.
Derek Sollenberger [Fri, 18 Dec 2009 13:59:22 +0000 (08:59 -0500)]
Explicitly requesting that the IME resize the WebView.

14 years agoadd initial dragtrackers
Mike Reed [Thu, 12 Nov 2009 17:49:34 +0000 (12:49 -0500)]
add initial dragtrackers

deleted:    src/com/android/browser/TestTracker.java

14 years agoMerge commit 'goog/eclair-plus-aosp'
Android Git Automerger [Tue, 15 Dec 2009 08:44:51 +0000 (00:44 -0800)]
Merge commit 'goog/eclair-plus-aosp'

14 years agoam a14a22f4: am c6343adf: Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 19:04:53 +0000 (11:04 -0800)]
am a14a22f4: am c6343adf: Changed class paths for classes moved in unbundling effort

Merge commit 'a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8'

* commit 'a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8':
  Changed class paths for classes moved in unbundling effort

14 years agoam c6343adf: Changed class paths for classes moved in unbundling effort
Paul Westbrook [Mon, 14 Dec 2009 18:37:55 +0000 (10:37 -0800)]
am c6343adf: Changed class paths for classes moved in unbundling effort

Merge commit 'c6343adff2abb5ae8ec2cc7ba613dd7e48ba7e9a' into eclair-mr2-plus-aosp

* commit 'c6343adff2abb5ae8ec2cc7ba613dd7e48ba7e9a':
  Changed class paths for classes moved in unbundling effort

14 years agoChanged class paths for classes moved in unbundling effort
Paul Westbrook [Fri, 11 Dec 2009 23:35:38 +0000 (15:35 -0800)]
Changed class paths for classes moved in unbundling effort

14 years agoam 3950d733: am c06a2da3: Merge change I4c7be8c7 into eclair-mr2
Derek Sollenberger [Mon, 14 Dec 2009 15:50:24 +0000 (07:50 -0800)]
am 3950d733: am c06a2da3: Merge change I4c7be8c7 into eclair-mr2

Merge commit '3950d733fad2f7cfd127ea26bf9c7a2a66623c33'

* commit '3950d733fad2f7cfd127ea26bf9c7a2a66623c33':
  Notify the WebView that its customView is not being displayed instead of failing silently.

14 years agoam 7fd68662: am 49b11f97: Fix a monkey crash by pretending to be a real adapter.
Patrick Scott [Mon, 14 Dec 2009 15:50:13 +0000 (07:50 -0800)]
am 7fd68662: am 49b11f97: Fix a monkey crash by pretending to be a real adapter.

Merge commit '7fd68662d80983776bcf1f0bb785b8e181f57eb6'

* commit '7fd68662d80983776bcf1f0bb785b8e181f57eb6':
  Fix a monkey crash by pretending to be a real adapter.

14 years agoam c06a2da3: Merge change I4c7be8c7 into eclair-mr2
Derek Sollenberger [Mon, 14 Dec 2009 15:29:53 +0000 (07:29 -0800)]
am c06a2da3: Merge change I4c7be8c7 into eclair-mr2

Merge commit 'c06a2da38a76eac4221f47cf17fccb27dc757fed' into eclair-mr2-plus-aosp

* commit 'c06a2da38a76eac4221f47cf17fccb27dc757fed':
  Notify the WebView that its customView is not being displayed instead of failing silently.

14 years agoam 49b11f97: Fix a monkey crash by pretending to be a real adapter.
Patrick Scott [Mon, 14 Dec 2009 15:29:37 +0000 (07:29 -0800)]
am 49b11f97: Fix a monkey crash by pretending to be a real adapter.

Merge commit '49b11f97360fea3bb37fc5cc3703587deaf32f00' into eclair-mr2-plus-aosp

* commit '49b11f97360fea3bb37fc5cc3703587deaf32f00':
  Fix a monkey crash by pretending to be a real adapter.

14 years agoMerge change I4c7be8c7 into eclair-mr2
Android (Google) Code Review [Mon, 14 Dec 2009 15:12:22 +0000 (07:12 -0800)]
Merge change I4c7be8c7 into eclair-mr2

* changes:
  Notify the WebView that its customView is not being displayed instead of failing silently.

14 years agoNotify the WebView that its customView is not being displayed instead of failing...
Derek Sollenberger [Tue, 8 Dec 2009 20:39:55 +0000 (15:39 -0500)]
Notify the WebView that its customView is not being displayed instead of failing silently.

14 years agoFix a monkey crash by pretending to be a real adapter.
Patrick Scott [Mon, 14 Dec 2009 14:32:13 +0000 (09:32 -0500)]
Fix a monkey crash by pretending to be a real adapter.

The monkey could generate this crash by sending a touch event to the view after
a tab was removed from TabControl (somehow). Use notifyDataSetChanged() to be a
better adapter. If we did not call notifyDataSetChanged and getCount() will
return something different, return the old count and post a message to update
the adapter.

Bug: 2307928

14 years agoam da646ac6: (-s ours) am 531ffb58: am 9c1d7d01: (-s ours) Import revised translation...
Eric Fischer [Fri, 11 Dec 2009 07:40:34 +0000 (23:40 -0800)]
am da646ac6: (-s ours) am 531ffb58: am 9c1d7d01: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'da646ac63099afa684a845b8932b1d8b3043c6c2'

* commit 'da646ac63099afa684a845b8932b1d8b3043c6c2':
  Import revised translations.  DO NOT MERGE

14 years agoam 531ffb58: am 9c1d7d01: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:52:35 +0000 (17:52 -0800)]
am 531ffb58: am 9c1d7d01: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '531ffb589684e215a683a8ef16fc118b6904053a' into eclair-mr2-plus-aosp

* commit '531ffb589684e215a683a8ef16fc118b6904053a':
  Import revised translations.  DO NOT MERGE

14 years agoam 9c1d7d01: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 11 Dec 2009 01:42:22 +0000 (17:42 -0800)]
am 9c1d7d01: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9c1d7d017787b73bf4737465fbaf07a07c0f545e' into eclair-mr2

* commit '9c1d7d017787b73bf4737465fbaf07a07c0f545e':
  Import revised translations.  DO NOT MERGE

14 years agoam fb6549b9: am d530494d: Provide a button to allow the user to set the home page...
Leon Scroggins [Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)]
am fb6549b9: am d530494d: Provide a button to allow the user to set the home page to the current page.

Merge commit 'fb6549b93476f115b4aa1a14523d98e27366d3e6'

* commit 'fb6549b93476f115b4aa1a14523d98e27366d3e6':
  Provide a button to allow the user to set the home page to the current page.

14 years agoam d530494d: Provide a button to allow the user to set the home page to the current...
Leon Scroggins [Thu, 10 Dec 2009 22:05:08 +0000 (14:05 -0800)]
am d530494d: Provide a button to allow the user to set the home page to the current page.

Merge commit 'd530494de9c182af4aff97ddd46343b32594da51' into eclair-mr2-plus-aosp

* commit 'd530494de9c182af4aff97ddd46343b32594da51':
  Provide a button to allow the user to set the home page to the current page.

14 years agoProvide a button to allow the user to set the home page to the current page.
Leon Scroggins [Thu, 10 Dec 2009 21:11:39 +0000 (16:11 -0500)]
Provide a button to allow the user to set the home page to the current page.

Fixes http://b/issue?id=2243560

14 years agoam ae779592: am 4e67a2a4: Merge change I22807d19 into eclair-mr2
Leon Scroggins [Thu, 10 Dec 2009 14:57:34 +0000 (06:57 -0800)]
am ae779592: am 4e67a2a4: Merge change I22807d19 into eclair-mr2

Merge commit 'ae77959253d69643ba0fc71647630cee880f3519'

* commit 'ae77959253d69643ba0fc71647630cee880f3519':
  Do not use the Cursor if it is closed.

14 years agoam 98f0d6db: am a143bfea: Merge change If65b50dd into eclair-mr2
Leon Scroggins [Thu, 10 Dec 2009 14:57:30 +0000 (06:57 -0800)]
am 98f0d6db: am a143bfea: Merge change If65b50dd into eclair-mr2

Merge commit '98f0d6db63213c3107cb8f2e6ed649df73f4521f'

* commit '98f0d6db63213c3107cb8f2e6ed649df73f4521f':
  Allow long press MENU to open IME in Browser.

14 years agoam 387ffb97: am 100a4f32: Cleaning up unused plugin declarations from the manifest.
Derek Sollenberger [Thu, 10 Dec 2009 14:57:26 +0000 (06:57 -0800)]
am 387ffb97: am 100a4f32: Cleaning up unused plugin declarations from the manifest.

Merge commit '387ffb97553ad872b5f9dce6a08ad68044086d91'

* commit '387ffb97553ad872b5f9dce6a08ad68044086d91':
  Cleaning up unused plugin declarations from the manifest.

14 years agoam 9c1d7d01: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 02:06:35 +0000 (18:06 -0800)]
am 9c1d7d01: Import revised translations.  DO NOT MERGE

Merge commit '9c1d7d017787b73bf4737465fbaf07a07c0f545e' into eclair-plus-aosp

* commit '9c1d7d017787b73bf4737465fbaf07a07c0f545e':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Dec 2009 01:24:39 +0000 (17:24 -0800)]
Import revised translations.  DO NOT MERGE

14 years agoam 4e67a2a4: Merge change I22807d19 into eclair-mr2
Leon Scroggins [Wed, 9 Dec 2009 23:45:33 +0000 (15:45 -0800)]
am 4e67a2a4: Merge change I22807d19 into eclair-mr2

Merge commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2' into eclair-mr2-plus-aosp

* commit '4e67a2a46507299a1aa8f2b94c33c3f65e5f78e2':
  Do not use the Cursor if it is closed.

14 years agoam a143bfea: Merge change If65b50dd into eclair-mr2
Leon Scroggins [Wed, 9 Dec 2009 23:45:30 +0000 (15:45 -0800)]
am a143bfea: Merge change If65b50dd into eclair-mr2

Merge commit 'a143bfea09ddb6a9a909773ace362cbc380e857a' into eclair-mr2-plus-aosp

* commit 'a143bfea09ddb6a9a909773ace362cbc380e857a':
  Allow long press MENU to open IME in Browser.

14 years agoam 100a4f32: Cleaning up unused plugin declarations from the manifest.
Derek Sollenberger [Wed, 9 Dec 2009 23:44:08 +0000 (15:44 -0800)]
am 100a4f32: Cleaning up unused plugin declarations from the manifest.

Merge commit '100a4f32c017c69938e4a5602c341130c8d1f4ce' into eclair-mr2-plus-aosp

* commit '100a4f32c017c69938e4a5602c341130c8d1f4ce':
  Cleaning up unused plugin declarations from the manifest.

14 years agoMerge change I22807d19 into eclair-mr2
Android (Google) Code Review [Tue, 8 Dec 2009 16:21:44 +0000 (08:21 -0800)]
Merge change I22807d19 into eclair-mr2

* changes:
  Do not use the Cursor if it is closed.

14 years agoMerge change If65b50dd into eclair-mr2
Android (Google) Code Review [Tue, 8 Dec 2009 16:18:22 +0000 (08:18 -0800)]
Merge change If65b50dd into eclair-mr2

* changes:
  Allow long press MENU to open IME in Browser.

14 years agoDo not use the Cursor if it is closed.
Leon Scroggins [Tue, 8 Dec 2009 16:15:36 +0000 (11:15 -0500)]
Do not use the Cursor if it is closed.

Fixes http://b/issue?id=2307930