Kristian Monsen
8b8f79898d
Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
...
Setting http:// at the start if there is no :// in the url
Change-Id: Idfae4f724808267fe9c8ab3864cfc4305ddac0e7
2011-02-01 15:14:11 +00:00
Dave Burke
84a34059eb
Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
...
Change-Id: If8f6aa38174e742e869bce7144de8db84b2f7150
2011-02-01 13:09:11 +00:00
Mike Cleron
ad97c1b128
Merge "Remove MeasuredText debug messages" into honeycomb
2011-01-31 23:22:36 -08:00
Justin Ho
7bae432587
Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb
2011-01-31 23:20:24 -08:00
Amith Yamasani
998127c804
Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
...
Bug: 3409194
Change-Id: I8a408a69fd14cf9058afe01ac5c46d0f5afc1503
2011-01-31 20:28:03 -08:00
Chet Haase
2cd52c809e
Merge "Fix invalidation issue with actionbar items" into honeycomb
2011-01-31 19:08:28 -08:00
Chet Haase
f28595e47d
Fix invalidation issue with actionbar items
...
When a view hierarchy becomes VISIBLE, it is possible that the display
list of some of the subtrees needs to be recreated. In particular, if
the subtree was measured while it was GONE, then the children probably
didn't have a valid size. If a display list is created for any of the
subnodes in the tree during this time, then they may have clipped the
children out.
The fix is to force the parent to become INVALIDATED whenever a child
view's bounds change (and it is VISIBLE).
Change-Id: I3624253e65354289f4fb94c9ba76a7e6fb82af9a
2011-01-31 18:52:12 -08:00
Gilles Debunne
8f8aac5e8a
Merge "Pixel were missing on the last line of text when using MaxLines." into honeycomb
2011-01-31 18:14:05 -08:00
Gilles Debunne
0ad4f0963a
Merge "Patches for the Paste window behavior." into honeycomb
2011-01-31 16:22:25 -08:00
Svetoslav Ganov
1c91433f7c
Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
2011-01-31 16:11:59 -08:00
Gilles Debunne
11f9647e03
Merge "Hint text is visible when using center gravity." into honeycomb
2011-01-31 15:29:56 -08:00
Gilles Debunne
3ce726eb94
Patches for the Paste window behavior.
...
Bug 3409440
Change-Id: Id266bb83aa6e1912817995881daa9c24a1553c32
2011-01-31 15:20:50 -08:00
Svetoslav Ganov
be17a7f269
Set time dialog display changes AM/PM at 1 instead of 12
...
bug:3408128
Change-Id: Ifb17cbc0f448281cebb20296dcc58766cde02965
2011-01-31 15:02:26 -08:00
Kenny Root
fbc8630736
Remove MeasuredText debug messages
...
MeasuredText debug messages were left in the tree. Remove them before
shipping.
Bug: 3408963
Change-Id: Ia220eae5835d1325bb6053de0025d8016a1edcad
2011-01-31 13:54:58 -08:00
Dianne Hackborn
e9da0c1de1
Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
2011-01-31 13:37:50 -08:00
Gilles Debunne
9a80a65046
Hint text is visible when using center gravity.
...
Bug 3379366
Non left aligned text uses the VERY_WIDE width, but the hint text
was not.
Change-Id: I7327958336acf7fe16bb89bb8b7bf9b869167d53
2011-01-31 12:57:00 -08:00
Dianne Hackborn
2bfa2ea1ec
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it. Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.
Change-Id: Iaa1ad431c9868254af7581499477bff98ed109e5
2011-01-31 12:34:56 -08:00
Gilles Debunne
c1eb127f4e
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
2011-01-31 12:01:34 -08:00
Joe Onorato
fe6fd24286
Merge "Mask out the non public bits, not the public ones." into honeycomb
2011-01-31 11:25:06 -08:00
Joe Onorato
6ab77bd5b3
Mask out the non public bits, not the public ones.
...
Bug: 3406103
Change-Id: I44b16700567cb2bf76efe9e8c1f9c82d0eaa8f10
2011-01-31 11:21:10 -08:00
Gilles Debunne
ccfcd9e813
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
2011-01-31 11:10:53 -08:00
Leon Scroggins
22e883dd4a
For Textareas, do not use UI side layers.
...
Bug:3402831
Bug:3401242
Requires a change in external/webkit.
Change-Id: I391d9133b3953d213520cbba5ed49b11ebeaef2d
2011-01-31 11:05:53 -05:00
Gilles Debunne
0a4db3c527
Pixel were missing on the last line of text when using MaxLines.
...
Bug 3295544
Only the last line of text includes the bottomPadding (extra line
spacing below the characters' descent. When The text is clipped using
maxLines, the desired height correctly added this value, but getLineTop
and getLineDescent are also used when the layout is drawn.
The fix is to make the layout aware of its clipping so that these
values are correctly updated.
Change-Id: I703656cf45022d34a90f55f0ed8fc5e4b30f80b1
2011-01-30 18:23:13 -08:00
Dianne Hackborn
260c3c77d9
Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
...an already-closed object: android.database.sqlite.SQLiteQuery
It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list. In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).
This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.
A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.
Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
2011-01-30 17:58:49 -08:00
John Reck
13934c2d71
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
2011-01-30 16:55:23 -08:00
John Reck
636ce004df
Prevent SET_SCROLL_OFFSET spam from clogging tubes
...
Bug: 3393571
Limit the event queue to a single pending SET_SCROLL_OFFSET. The
problem on slashdot.org was that the event thread was being flooded
with SET_SCROLL_OFFSET messages faster than it could process them,
causing the handler to get jammed up.
Change-Id: Ia4a90a030959d0b3769067791089cdb261ae403a
2011-01-30 16:23:09 -08:00
Adam Powell
c9cb308371
Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb
2011-01-30 16:12:56 -08:00
Joe Onorato
4de68baed4
Merge "Check for the STATUS_BAR permission for the system UI properties." into honeycomb
2011-01-30 16:00:52 -08:00
Gilles Debunne
236b987214
Merge "Auto-clearing setError popup" into honeycomb
2011-01-30 15:49:38 -08:00
Adam Powell
65a1de963a
Fix bug 3405899 - android.view.WindowManager$BadTokenException
...
Clear any pending runnables involved with TextViews when cursor
controllers are released
Change-Id: I96898fcc237f20d0b0f2351181244cb171fa2083
2011-01-30 15:47:29 -08:00
Joe Onorato
ac0ee89bd9
Check for the STATUS_BAR permission for the system UI properties.
...
If the app doesn't have that permission, just mask out the bits.
Also makes the systemUiVisibility field visible in hierarchyviewer.
Change-Id: Ic3d3a3aed96b5c6448832755b4b2e6175117e5be
2011-01-30 15:38:30 -08:00
The Android Open Source Project
b2abd8c424
Mass merge from gingerbread - do not merge
...
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Gilles Debunne
12ab64593f
Auto-clearing setError popup
...
Bug 3403325
Error popup has to be dismissed whether or not the key was handled.
Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
2011-01-30 12:11:24 -08:00
Joe Malin
51990f9b0c
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
2011-01-30 09:45:59 -08:00
Ken Wakasa
8710e76a89
Follow up change to I741642ac
...
Fix wrong constant.
bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
2011-01-30 11:02:09 +09:00
Jean-Baptiste Queru
8f4a04f04c
am 1358b6a4: Tweak to make merges easier
...
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
7ea919c44b
Merge 6b739dc7 from gingerbread
...
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Jean-Baptiste Queru
1358b6a4fb
Tweak to make merges easier
...
Bug: 3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
2011-01-29 12:54:09 -08:00
Jason parks
a2e765ef1a
Merge "Update the encryption password when the device password is changed." into honeycomb
2011-01-29 12:02:19 -08:00
Jean-Baptiste Queru
0044b4ad6a
Merge d350dc04 from gingerbread
...
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
2011-01-29 10:57:48 -08:00
Nick Pelly
4226be3f04
am 21d0a173: Fix build - javadoc.
...
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
2011-01-29 10:40:07 -08:00
Jean-Baptiste Queru
0440cc1fb7
Merge eab0e97b from gingerbread
...
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
2011-01-29 10:38:09 -08:00
Kenny Root
c68a657f12
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
962d556a12
Merge f126ad3b from gingerbread
...
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
2011-01-29 09:37:44 -08:00
Nick Pelly
1ac6d08a05
am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
2011-01-29 09:31:56 -08:00
Sylvain Fonteneau
addd46c658
am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-29 07:29:56 -08:00
Jean-Baptiste Queru
86e1c5b9f6
Merge c896d85c from gingerbread
...
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
ac983353e6
Merge da01b4ab from gingerbread
...
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
2011-01-29 07:17:22 -08:00
Jeff Hamilton
6d904e7039
am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
2011-01-29 07:09:21 -08:00
Joe Onorato
a0f2cdb507
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00