8973 Commits

Author SHA1 Message Date
Brian Carlstrom
9147a0ed64 SslCertificate should use Dates - fixing api for build
Also fixing missing @deprecated noticed when updating API
2010-03-02 11:24:39 -08:00
Fred Quintana
002ffad599 change ObserverNode.binderDied() to lock the root node before manipulating
the observers tree by calling removeObserverLocked()

http://b/issue?id=2457485
2010-03-02 11:18:16 -08:00
Brian Carlstrom
00611034ca Merge "SslCertificate should provide Date interface" 2010-03-02 11:08:32 -08:00
Brian Carlstrom
445d8f1592 SslCertificate should provide Date interface
While working on out openssl code, I found a Y2k bug that the dates
from invalidate certificates could be shown as 1909 instead of 2009.
The reason was because SslCertificate/BrowserActivity passed the
values around as Strings even though the started as Dates (from
X509Certificate) and were converted backed to Dates before
presentation by BrowserActivity's reformatCertificateDate.

SslCertificate now maintains date fields internally as Date objects
without converting them to Strings. The constructor and String
accessors, which are now @deprecated, now specify the format as an ISO
8601 date string which uses 4 digit years.

BrowserActivity now reformatCertificateDate is now simply
formatCertificateDate and no longer has to convert from String to Date
and back to String to get proper Locale formatting.

CTS SslCertificateTest also updated.
2010-03-02 11:07:32 -08:00
Grace Kloba
8430c1a7d9 Merge "When titlebar's visible height changed, it means the WebKit viewsize need to be updated." 2010-03-02 11:01:41 -08:00
Gilles Debunne
176f9fc215 Null pointer tests removed from HeaderViewListAdapter.
The mHeaderViewInfos and mFooterViewInfos lists were sometimes tested for nullity
and sometimes not. Should these values be null, some conditionnal code was actually
flawed in getView() and getItem() because of too strong 'and' conditionnals.

These lists are created upon declaration in ListView and are then shared and hence
cannot be null. Null tests were hence removed. getView() and getItem() get simpler
and work as before.

Change-Id: I279e482730ce6148a559d15a9863afc8f6b67780
2010-03-02 11:00:50 -08:00
Bjorn Bringert
d95c8f2dae Merge "Fixing: search button and mic button are not right-aligned" 2010-03-02 10:57:35 -08:00
Valentin Kravtsov
59b0b74abf Fixing: search button and mic button are not right-aligned
Second part of bug fix for: http://b/issue?id=2478280

On sapphire only, the right edge of the mic and search buttons is not aligned

Change-Id: I1919c762eafca19de026fb4f10e03574d02b423c
2010-03-02 18:44:51 +00:00
Grace Kloba
4addf9b5d8 When titlebar's visible height changed, it means the
WebKit viewsize need to be updated.

Fix http://b/issue?id=2470621
2010-03-02 10:28:13 -08:00
Leon Clarke
43242d02e9 am ba74d7cc: am e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7'

* commit 'ba74d7ccadc34d09d57886120e9d412d9edbc4d7':
  Fix issue with authentication with flash
2010-03-02 08:44:48 -08:00
Leon Clarke
ba74d7ccad am e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292' into eclair-mr2-plus-aosp

* commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292':
  Fix issue with authentication with flash
2010-03-02 08:38:54 -08:00
Cary Clark
f79a819f24 Merge "account for find dialog height when positioning layers" 2010-03-02 08:37:18 -08:00
Leon Clarke
e861b8f95d Merge " Fix issue with authentication with flash" into eclair-mr2 2010-03-02 08:33:10 -08:00
Grace Kloba
c2ca936700 Merge "Start the synchronous load in the WebCore thread." 2010-03-02 08:21:22 -08:00
Cary Clark
72ab9980cb account for find dialog height when positioning layers
The Find dialog draws on top of the WebView, including any
layers attached to the bottom of the screen. Adjust the view
dimenions returned to the layer code by the height of the Find
dialog if visible.

http://b/2453769
2010-03-02 10:59:44 -05:00
Andy McFadden
7d7ce2bbdd Merge "Tone down a log message." 2010-03-02 07:36:23 -08:00
Derek Sollenberger
717c6ae0cf am 2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Merge commit '2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp

* commit '2705c8f09975f1bf10c84af323a67c104a177129':
  DO NOT MERGE. force plugins to render on top of browser content.
2010-03-02 06:44:47 -08:00
Leon Clarke
cb01dba348 Fix issue with authentication with flash 2010-03-02 14:43:03 +00:00
Derek Sollenberger
2705c8f099 Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2 2010-03-02 06:33:32 -08:00
Patrick Scott
0245e09fa7 Merge "Store the LoadListener in the SslErrorHandler passed to the client." 2010-03-02 05:40:09 -08:00
Grace Kloba
5f38e1aaa1 Start the synchronous load in the WebCore thread.
Fix http://b/issue?id=2480606
2010-03-01 23:10:10 -08:00
Ken Shirriff
0ef3eeec40 Merge "Remove DateException and obsolete DateUtils functions." 2010-03-01 22:46:07 -08:00
Romain Guy
34db992802 Merge "Cleaning in ListWithEditTextHeaderTest." 2010-03-01 21:56:22 -08:00
Dianne Hackborn
829778843c Move the pointer location thing out of common. 2010-03-01 21:42:15 -08:00
Dianne Hackborn
ef05e076ce Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:

- The aapt tool now sets a resource configurations sdk level to match any configs
  that have been set (for example if you specify density your sdk level will be
  at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
2010-03-01 20:42:14 -08:00
Charles Chen
883dbacb12 Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings." 2010-03-01 19:05:20 -08:00
Charles Chen
6a8b73be57 Fixing a bug with TTS that caused TTS to ignore the default settings
unless the user had set the defaults to always override app settings.
2010-03-01 18:52:41 -08:00
Mathias Agopian
5d26c1e38d Added a name to Surface created by SurfaceFlinger
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
2010-03-01 18:34:50 -08:00
Romain Guy
42c79880b0 Apply alpha animations on ImageView instances.
Bug #2479570
2010-03-01 17:21:59 -08:00
Daniel Sandler
7491d8757f Merge "New vibrate/silent mode behavior." 2010-03-01 17:16:55 -08:00
Ken Shirriff
cfa8fd0799 Remove unused Calendar.insertVEvent method 2010-03-01 16:42:42 -08:00
Romain Guy
58c63990a2 Merge "Prevent crash in Dialog. Bug #2249637" 2010-03-01 16:41:27 -08:00
Romain Guy
7883c975dd Prevent crash in Dialog.
Bug #2249637
2010-03-01 16:39:17 -08:00
Marc Blank
918a95b9c9 Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA" 2010-03-01 16:18:27 -08:00
Marc Blank
5b8c69d95a Rename _SYNC_LOCAL_ID to _SYNC_DATA
* This is being used as a discretionary column by Exchange calendar
  sync, so rename to avoid association with old usage

Change-Id: I544e285fa04d252c945c1953b57ef67da0e588ae
2010-03-01 16:17:50 -08:00
Grace Kloba
c0524d26a6 am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp

* commit '3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
  DO NOT MERGE
2010-03-01 16:13:21 -08:00
Grace Kloba
3ff7cecd3d Merge "DO NOT MERGE" into eclair-mr2 2010-03-01 16:02:12 -08:00
Gilles Debunne
3c5d27ab1b Cleaning in ListWithEditTextHeaderTest.
Switched to ActivityInstrumentationTestCase2.

As far as http://b/issue?id=2446911 is concerned, I was unable
to reproduce a test fail. This was not the case a week ago.
A fix has probably been submitted in the meantime.

Change-Id: Id6e95218a2c9d29b0b4eb051a7a1288f9a9809fd
2010-03-01 16:01:52 -08:00
Vasu Nori
fb9f10f693 Merge "revert due to the sqlite build problem on Mac.." 2010-03-01 15:54:34 -08:00
Vasu Nori
b649ca250a revert due to the sqlite build problem on Mac.. 2010-03-01 15:53:05 -08:00
Wu-cheng Li
8cbb8f5e1f Unhide zoom API.
bug:2458926
2010-03-01 15:32:33 -08:00
Kenny Root
ec8f9b6481 Fix misspelling in JavaDoc tag
Minor misspelling in "@inheritDoc" tag

Change-Id: I1e6252b549c20e1871e4be0170d2d06256beec9f
2010-03-01 15:01:51 -08:00
Fred Quintana
aceb6fe23e Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle" 2010-03-01 14:47:22 -08:00
Fred Quintana
262226137d fix a system crash that occurs when ChooseAccountActivity is
restarted from the icicle

http://b/issue?id=2352368
2010-03-01 14:39:00 -08:00
Romain Guy
61c9d4b450 Let apps change the bottom strip in TabWidget.
Bug #2478088

Also expose a few useful APIs.
2010-03-01 14:23:23 -08:00
Vasu Nori
e0dab5bf67 Merge "register a logging func with sqlite, to get extra info on errors" 2010-03-01 14:22:08 -08:00
Ken Shirriff
a53bbe4033 Remove DateException and obsolete DateUtils functions.
These functions are deprecated and no longer used.
2010-03-01 14:21:13 -08:00
Paul Westbrook
37acc3122c Merge "Bug 2464063" 2010-03-01 14:21:03 -08:00
Andy McFadden
701d916a9c Tone down a log message.
Sometimes shell commands like "am" return before the framework stuff
really finishes initializing (e.g. if you give it no arguments so you
can see the usage info).  The runtime used to print the dire and
uninformative message:

  E/AndroidRuntime(): ERROR: thread attach failed

With this change it's a bit more subdued:

  I/AndroidRuntime(): NOTE: attach of thread 'Binder Thread #2' failed

Ideally it wouldn't get logged at all when it's "expected", but that
requires actual code changes.
2010-03-01 14:08:49 -08:00
Grace Kloba
12f807091d am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
Merge commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8'

* commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8':
  If we get TOUCH_UP before getting the WebCore's
2010-03-01 13:16:46 -08:00