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
Adam Powell
5f639d5a51
Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
2011-01-31 16:11:51 -08:00
Eric Fischer
a019d15b66
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-31 16:08:52 -08:00
Gilles Debunne
7ad1a8e6c2
am e19246a3: am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
...
* commit 'e19246a38b76645bde43858945e78fcd2370b394':
Hint text is visible when using center gravity.
2011-01-31 15:46:56 -08:00
Justin Ho
81e5beab84
am c15d7f63: am 53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
...
* commit 'c15d7f63f047149e3fee0f2fc57539fb32856260':
Updated fallback sound for Honeycomb tablet
2011-01-31 15:45:55 -08:00
Jean-Baptiste Queru
c0e95048b9
Don't crash zygote if webcore fails to load
...
Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
2011-01-31 15:43:19 -08:00
Gilles Debunne
e19246a38b
am 11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
...
* commit '11f9647e03d4e1141bc4312626c8dc9116f1f470':
Hint text is visible when using center gravity.
2011-01-31 15:32:40 -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
Adam Powell
d76cee2b09
Fix bug 3408834 - actionbar stays gone when leaving reader in
...
lightsout mode
Fix an opportunity for race conditions when the action bar is
shown/hidden rapidly.
Change-Id: I91c0666cad3afd8a4d870d642f971949fba0d333
2011-01-31 15:05:05 -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
Dianne Hackborn
fe86a7f64c
am 723453a7: am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit '723453a7a77180b47720d3b5e8a9752349b77e2f':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 15:01:16 -08:00
Gilles Debunne
46844af4f2
am ed6f13c4: am c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'ed6f13c4bd06dc4ef971cb720b8880ab1df3905a':
Tabs are resized to make sure they fit in their parent.
2011-01-31 15:01:01 -08:00
Dianne Hackborn
1368454815
am e6c6b760: DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
* commit 'e6c6b760eb0c1068fdfa656007ec27e482313b58':
DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 14:36:02 -08:00
Justin Ho
c15d7f63f0
am 53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
...
* commit '53fe1045717163a227041643852a25dbcd4bc2b5':
Updated fallback sound for Honeycomb tablet
2011-01-31 14:32:52 -08:00
Ashish Sharma
beda53d5a6
Fix a minor documentation bug in TrafficStats.
...
Change-Id: I3cf2199797d875ccb6ab432c298afaace44c7527
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-01-31 14:30:16 -08:00
Justin Ho
53fe104571
Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
2011-01-31 14:26:20 -08:00
Dianne Hackborn
723453a7a7
am e9da0c1d: Merge "Fix issue #3408542 : "resizeable" attribute required to get out of compat mode" into honeycomb
...
* commit 'e9da0c1de179e3cdb2d3709bde2b5cb6eb192230':
Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 13:56:24 -08:00
Gilles Debunne
ed6f13c4bd
am c1eb127f: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
...
* commit 'c1eb127f4e19c1f86e4b18c2c1daebe2404eeb93':
Tabs are resized to make sure they fit in their parent.
2011-01-31 13:56:21 -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
e6c6b760eb
DO NOT MERGE 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: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
2011-01-31 13:44:14 -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
Eric Fischer
0ddd275ede
Import revised translations. DO NOT MERGE. Bug 3394542
...
Change-Id: I49b085e0d1c4a3a131ba0f967166b915aaa24c57
2011-01-31 12:41:43 -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
Eric Fischer
a85afd133f
Import revised translations. DO NOT MERGE
...
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
2011-01-31 12:17:36 -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
b4e28848e3
am 19a02219: am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
...
* commit '19a022194d0e049759112a743835af323f4b05a1':
Mask out the non public bits, not the public ones.
2011-01-31 11:28:35 -08:00
Joe Onorato
19a022194d
am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb
...
* commit 'fe6fd242867022576a99fcd5fd6078fb7bab8451':
Mask out the non public bits, not the public ones.
2011-01-31 11:26:51 -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
6d54ec7e82
am 85ebed39: am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
...
* commit '85ebed39e4b7710b56e25d10038172dde12ef7b0':
Fxi initial error popup dialog in TextEdit and refreshed assets.
2011-01-31 11:16:16 -08:00
Gilles Debunne
85ebed39e4
am ccfcd9e8: Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
...
* commit 'ccfcd9e813d090ec9b4390b5217b32f73dd8263d':
Fxi initial error popup dialog in TextEdit and refreshed assets.
2011-01-31 11:13:24 -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
Justin Ho
6871ede4be
Updated fallback sound for Honeycomb tablet
...
Change-Id: I01b27b5d095d7280ed1fc4662ce2c84f61e7b681
2011-01-31 08:45:55 -08:00
Leon Scroggins
e7e8e976a1
am 5592f0b1: am 22e883dd: For Textareas, do not use UI side layers.
...
* commit '5592f0b16e44515a3e3686fd417cc1945b83c764':
For Textareas, do not use UI side layers.
2011-01-31 08:26:35 -08:00
Leon Scroggins
5592f0b16e
am 22e883dd: For Textareas, do not use UI side layers.
...
* commit '22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
2011-01-31 08:24:31 -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
cc322207cc
am 97510f6a: am 260c3c77: Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
* commit '97510f6abda493119cbf7db84064291a7edacfc0':
Fix issue #3381489 : IllegalStateException: attempt to re-open...
2011-01-30 18:08:12 -08:00
Dianne Hackborn
97510f6abd
am 260c3c77: Fix issue #3381489 : IllegalStateException: attempt to re-open...
...
* commit '260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #3381489 : IllegalStateException: attempt to re-open...
2011-01-30 18:05:08 -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
592f6f963a
am a4b23164: am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
...
* commit 'a4b23164167c571e6d22c3486105fdef17ff8e4a':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
2011-01-30 17:30:17 -08:00
John Reck
a4b2316416
am 13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
...
* commit '13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
2011-01-30 17:12:29 -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
c75676f8db
am 853f284c: am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb
...
* commit '853f284c0b80540cf447af0e6e704d7a05947efd':
Fix bug 3405899 - android.view.WindowManager$BadTokenException
2011-01-30 16:17:59 -08:00
Dianne Hackborn
58468459dc
am 9e3754ff: am 54ad3611: Merge "Fix issue #3404571 : Commit final APIs" into honeycomb
...
* commit '9e3754ff6dcc81c43708ce0e13c75de836173f64':
Fix issue #3404571 : Commit final APIs
2011-01-30 16:15:13 -08:00
Adam Powell
853f284c0b
am c9cb3083: Merge "Fix bug 3405899 - android.view.WindowManager" into honeycomb
...
* commit 'c9cb30837116b138a91b251e5217a644231eebef':
Fix bug 3405899 - android.view.WindowManager$BadTokenException
2011-01-30 16:14:54 -08:00
Adam Powell
c9cb308371
Merge "Fix bug 3405899 - android.view.WindowManager$BadTokenException" into honeycomb
2011-01-30 16:12:56 -08:00