OSDN Git Service
Eric Fischer [Tue, 1 Feb 2011 02:32:11 +0000 (18:32 -0800)]
am
122106cb: Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
* commit '
122106cb9be37fb97c0315b927771ec6fcb94aa4':
Import revised translations. DO NOT MERGE. Bug
3394542
satok [Tue, 1 Feb 2011 02:31:46 +0000 (18:31 -0800)]
am
076d059b: Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
* commit '
076d059b54664b31920f0be13d56c657ab77cecc':
Not to update IME when Settings version is older than the last updated version.
Justin Ho [Tue, 1 Feb 2011 02:31:23 +0000 (18:31 -0800)]
am
90a9ab56: Merge "Updating notification title close asset" into honeycomb
* commit '
90a9ab56e0a41501cdd283c6e7022fd071334070':
Updating notification title close asset
Andreas Huber [Tue, 1 Feb 2011 02:31:05 +0000 (18:31 -0800)]
am
537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
* commit '
537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
Disconnect HTTP live sessions as soon as the request comes in.
Gilles Debunne [Tue, 1 Feb 2011 02:30:42 +0000 (18:30 -0800)]
am
0ad4f096: Merge "Patches for the Paste window behavior." into honeycomb
* commit '
0ad4f0963a47feafaaa92a756fb84caab5b6bddb':
Patches for the Paste window behavior.
Dianne Hackborn [Tue, 1 Feb 2011 01:58:08 +0000 (17:58 -0800)]
am
b04ec6a8: (-s ours) am
7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '
b04ec6a8a7e6a684eb4b8d434c87b76bbac9c80c':
Do not check features in PackageManagerService DO NOT MERGE
Dianne Hackborn [Tue, 1 Feb 2011 01:55:11 +0000 (17:55 -0800)]
am
7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '
7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
Do not check features in PackageManagerService DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 01:48:57 +0000 (17:48 -0800)]
am
3efb3153: (-s ours) am
a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3efb3153137d310851346807fcc04e71144c5413':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Eric Fischer [Tue, 1 Feb 2011 01:27:30 +0000 (17:27 -0800)]
Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
satok [Tue, 1 Feb 2011 00:53:05 +0000 (16:53 -0800)]
Merge "Not to update IME when Settings version is older than the last updated version." into honeycomb
Justin Ho [Tue, 1 Feb 2011 00:36:09 +0000 (16:36 -0800)]
Merge "Updating notification title close asset" into honeycomb
Kenny Root [Tue, 1 Feb 2011 00:25:25 +0000 (16:25 -0800)]
Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.
Bug:
3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
Justin Ho [Tue, 1 Feb 2011 00:27:28 +0000 (16:27 -0800)]
Updating notification title close asset
Change-Id: Id985d9f71b427b353d4f7a390c84fd40e8d43fc4
Andreas Huber [Tue, 1 Feb 2011 00:23:27 +0000 (16:23 -0800)]
Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb
Gilles Debunne [Tue, 1 Feb 2011 00:22:25 +0000 (16:22 -0800)]
Merge "Patches for the Paste window behavior." into honeycomb
Andreas Huber [Tue, 1 Feb 2011 00:18:49 +0000 (16:18 -0800)]
Disconnect HTTP live sessions as soon as the request comes in.
Instead of waiting until pending events have been processed.
Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug:
3409681
Eric Fischer [Tue, 1 Feb 2011 00:18:27 +0000 (16:18 -0800)]
am
a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
Svetoslav Ganov [Tue, 1 Feb 2011 00:15:26 +0000 (16:15 -0800)]
am
1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
* commit '
1c91433f7c61860319fa5d524b503c2631a7f2d3':
Set time dialog display changes AM/PM at 1 instead of 12
Adam Powell [Tue, 1 Feb 2011 00:15:20 +0000 (16:15 -0800)]
am
5f639d5a: Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
* commit '
5f639d5a5134b994ee77207ac931bdafe95c6d66':
Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode
Svetoslav Ganov [Tue, 1 Feb 2011 00:11:59 +0000 (16:11 -0800)]
Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
Adam Powell [Tue, 1 Feb 2011 00:11:51 +0000 (16:11 -0800)]
Merge "Fix bug
3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
satok [Mon, 31 Jan 2011 13:14:32 +0000 (22:14 +0900)]
Not to update IME when Settings version is older than the last updated version.
- Check if just old version or not.
- Sometimes, ContentObserver.onChange is called before finishing to save the actual value.
This can be verified by checking the system settings version. If the version is not updated,
cached value will be returned from Settings.Secure, and this should not be handled.
Bug:
3406300
Change-Id: Ie3f5b484b5574e10a41dfc209ed31271a474b828
Gilles Debunne [Mon, 31 Jan 2011 23:32:40 +0000 (15:32 -0800)]
am
11f9647e: Merge "Hint text is visible when using center gravity." into honeycomb
* commit '
11f9647e03d4e1141bc4312626c8dc9116f1f470':
Hint text is visible when using center gravity.
Gilles Debunne [Mon, 31 Jan 2011 23:29:56 +0000 (15:29 -0800)]
Merge "Hint text is visible when using center gravity." into honeycomb
Gilles Debunne [Mon, 31 Jan 2011 23:00:08 +0000 (15:00 -0800)]
Patches for the Paste window behavior.
Bug
3409440
Change-Id: Id266bb83aa6e1912817995881daa9c24a1553c32
Adam Powell [Mon, 31 Jan 2011 23:05:05 +0000 (15:05 -0800)]
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
Svetoslav Ganov [Mon, 31 Jan 2011 22:21:56 +0000 (14:21 -0800)]
Set time dialog display changes AM/PM at 1 instead of 12
bug:
3408128
Change-Id: Ifb17cbc0f448281cebb20296dcc58766cde02965
Dianne Hackborn [Mon, 31 Jan 2011 22:38:24 +0000 (14:38 -0800)]
am
13684548: (-s ours) am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
1368454815aaf793fe32ba32473fd11cf7b02e0d':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Dianne Hackborn [Mon, 31 Jan 2011 22:36:02 +0000 (14:36 -0800)]
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
Raphael [Mon, 31 Jan 2011 22:32:56 +0000 (14:32 -0800)]
am
03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
* commit '
03245a8ec46acc7c2b24d3d680ea5b88bd89ce13':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
Justin Ho [Mon, 31 Jan 2011 22:32:52 +0000 (14:32 -0800)]
am
53fe1045: Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
* commit '
53fe1045717163a227041643852a25dbcd4bc2b5':
Updated fallback sound for Honeycomb tablet
Raphael [Mon, 31 Jan 2011 22:30:28 +0000 (14:30 -0800)]
Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
Justin Ho [Mon, 31 Jan 2011 22:26:20 +0000 (14:26 -0800)]
Merge "Updated fallback sound for Honeycomb tablet" into honeycomb
Jamie Gennis [Mon, 31 Jan 2011 22:14:50 +0000 (14:14 -0800)]
am
b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
* commit '
b799314e64d5afe050aeee394f0c29d7728c1e22':
Add SurfaceTexture docs for getTransformMatrix.
Jamie Gennis [Mon, 31 Jan 2011 22:11:26 +0000 (14:11 -0800)]
Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 22:00:52 +0000 (14:00 -0800)]
Jamie Gennis [Mon, 31 Jan 2011 21:56:28 +0000 (13:56 -0800)]
am
8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
* commit '
8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
Dianne Hackborn [Mon, 31 Jan 2011 21:56:24 +0000 (13:56 -0800)]
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
Gilles Debunne [Mon, 31 Jan 2011 21:56:21 +0000 (13:56 -0800)]
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.
Dianne Hackborn [Mon, 31 Jan 2011 20:34:56 +0000 (12:34 -0800)]
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
Jamie Gennis [Mon, 31 Jan 2011 21:38:27 +0000 (13:38 -0800)]
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 21:37:50 +0000 (13:37 -0800)]
Merge "Fix issue #
3408542: "resizeable" attribute required to get out of compat mode" into honeycomb
Raphael [Fri, 28 Jan 2011 00:48:27 +0000 (16:48 -0800)]
LayoutLib.Create: support Outer_Inner_Delegate renaming.
When generating delegates, LayoutLib.Create support renaming
inner classes. Only one level of inner class is supported.
The method Outer$Inner#get(...) generates a call to:
static Outer_Inner_Delegate#get(Outer instance, Outer$Inner instance, ...)
Change-Id: Ie70f2b8e5e5f311ed9c7f26b7f64637ae6157a51
Gilles Debunne [Mon, 31 Jan 2011 20:56:07 +0000 (12:56 -0800)]
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
Eric Fischer [Mon, 31 Jan 2011 20:41:43 +0000 (12:41 -0800)]
Import revised translations. DO NOT MERGE. Bug
3394542
Change-Id: I49b085e0d1c4a3a131ba0f967166b915aaa24c57
Dianne Hackborn [Mon, 31 Jan 2011 20:34:56 +0000 (12:34 -0800)]
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
Jamie Gennis [Mon, 31 Jan 2011 20:31:53 +0000 (12:31 -0800)]
Add SurfaceTexture docs for getTransformMatrix.
Change-Id: Ib08d00525c7932b23ba5066c07c7470f813b74f8
Eric Fischer [Mon, 31 Jan 2011 20:17:36 +0000 (12:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)]
Gilles Debunne [Mon, 31 Jan 2011 20:01:34 +0000 (12:01 -0800)]
Merge "Tabs are resized to make sure they fit in their parent." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Daniel Sandler [Mon, 31 Jan 2011 19:49:03 +0000 (11:49 -0800)]
am
4f63da64: Merge "Alignment in the title area of the notification panel." into honeycomb
* commit '
4f63da64d82131388ff02586e5fe19662fe641de':
Alignment in the title area of the notification panel.
Daniel Sandler [Mon, 31 Jan 2011 19:46:57 +0000 (11:46 -0800)]
Merge "Alignment in the title area of the notification panel." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Joe Onorato [Mon, 31 Jan 2011 19:26:51 +0000 (11:26 -0800)]
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.
Joe Onorato [Mon, 31 Jan 2011 19:25:06 +0000 (11:25 -0800)]
Merge "Mask out the non public bits, not the public ones." into honeycomb
Joe Onorato [Mon, 31 Jan 2011 19:21:10 +0000 (11:21 -0800)]
Mask out the non public bits, not the public ones.
Bug:
3406103
Change-Id: I44b16700567cb2bf76efe9e8c1f9c82d0eaa8f10
Gilles Debunne [Mon, 31 Jan 2011 19:13:24 +0000 (11:13 -0800)]
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.
Gilles Debunne [Mon, 31 Jan 2011 19:10:53 +0000 (11:10 -0800)]
Merge "Fxi initial error popup dialog in TextEdit and refreshed assets." into honeycomb
Jeff Hamilton [Mon, 31 Jan 2011 19:03:50 +0000 (11:03 -0800)]
am
ddd11292: Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
* commit '
ddd11292d1be8d33989e3a67bf6398464ef2632c':
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Jeff Hamilton [Mon, 31 Jan 2011 19:01:07 +0000 (11:01 -0800)]
Merge "Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE" into honeycomb
Daniel Sandler [Mon, 31 Jan 2011 18:38:06 +0000 (13:38 -0500)]
Alignment in the title area of the notification panel.
Clock size -> 78sp to match specs
Clock right pad -> 6dp to achieve 14dp escapement
Bug:
3400754
Change-Id: I04a56aa899ab55804ad034ed06d9c7aaad331bc0
Jeff Hamilton [Mon, 31 Jan 2011 18:11:46 +0000 (10:11 -0800)]
am
f7176dfb: am
113834c5: Commit the final API for level 10.
* commit '
f7176dfbd284f7da49e5bccc2aa886b42039ba4a':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Merge from gingerbread: Commit the final API for level 10. DO NOT MERGE
Change-Id: If1d1ff69a6f3e80796d68ec5dbfa722adce23d40
Jeff Hamilton [Mon, 31 Jan 2011 17:46:29 +0000 (11:46 -0600)]
Commit the final API for level 10.
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
Daniel Sandler [Mon, 31 Jan 2011 17:08:00 +0000 (09:08 -0800)]
am
cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb
* commit '
cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
Kill spurious animations when vetoing notifications.
Daniel Sandler [Mon, 31 Jan 2011 17:04:32 +0000 (09:04 -0800)]
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:49:30 +0000 (08:49 -0800)]
am
81f4b582: Merge "Fix hardware keyboard switch listener" into honeycomb
* commit '
81f4b582d4f3547bcd432da6bcb21d4ef414723d':
Fix hardware keyboard switch listener
Tadashi G. Takaoka [Mon, 31 Jan 2011 16:47:12 +0000 (08:47 -0800)]
Merge "Fix hardware keyboard switch listener" into honeycomb
Justin Ho [Mon, 31 Jan 2011 16:45:55 +0000 (08:45 -0800)]
Updated fallback sound for Honeycomb tablet
Change-Id: I01b27b5d095d7280ed1fc4662ce2c84f61e7b681
Leon Scroggins [Mon, 31 Jan 2011 16:24:31 +0000 (08:24 -0800)]
am
22e883dd: For Textareas, do not use UI side layers.
* commit '
22e883dd4a400122003506f47b228378000dd12f':
For Textareas, do not use UI side layers.
Tadashi G. Takaoka [Mon, 31 Jan 2011 09:39:27 +0000 (18:39 +0900)]
Fix hardware keyboard switch listener
Bug:
3391067
Change-Id: I64ae55652afedee60a70bc140cfb328b04bc8c83
Leon Scroggins [Mon, 31 Jan 2011 15:54:19 +0000 (10:54 -0500)]
For Textareas, do not use UI side layers.
Bug:
3402831
Bug:
3401242
Requires a change in external/webkit.
Change-Id: I391d9133b3953d213520cbba5ed49b11ebeaef2d
Gil Dobjanschi [Mon, 31 Jan 2011 12:13:06 +0000 (04:13 -0800)]
am
2bb13573: Bug fix:
3405930 Crash editing overlay text
* commit '
2bb13573d619e3371d06847d36db78a20b17dfab':
Bug fix:
3405930 Crash editing overlay text
Gil Dobjanschi [Mon, 31 Jan 2011 09:16:32 +0000 (01:16 -0800)]
Bug fix:
3405930 Crash editing overlay text
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
Wink Saville [Mon, 31 Jan 2011 07:14:39 +0000 (23:14 -0800)]
am
cde85d57: Merge "Add debug for tracking bug
3404006." into honeycomb
* commit '
cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
Add debug for tracking bug
3404006.
Wink Saville [Mon, 31 Jan 2011 07:12:35 +0000 (23:12 -0800)]
Merge "Add debug for tracking bug
3404006." into honeycomb
Bart Sears [Mon, 31 Jan 2011 04:08:13 +0000 (20:08 -0800)]
am
e3004e78: New DroidSansFallback font file from Ascender
* commit '
e3004e7867925e70bf4930384a265106f45f87d6':
New DroidSansFallback font file from Ascender
Bart Sears [Mon, 31 Jan 2011 03:59:02 +0000 (19:59 -0800)]
New DroidSansFallback font file from Ascender
Bug:
3315583
1) IPA (U+0250-U+02AF)
2) Currency symbols
3) U+02BB MODIFIER LETTER TURNED COMMA
4) Non-breaking hyphen ("\u2011")
5) Jamo U+11xx mappings
Change-Id: Ie4dfc7677d0f63c89ed0e1f6506cd513ae45ffa9
Daniel Sandler [Mon, 31 Jan 2011 02:26:24 +0000 (21:26 -0500)]
Kill spurious animations when vetoing notifications.
Bug:
3406032
Change-Id: I6da6ee064d309bc44f6304722c5f3f4e05aaf687
Dheeraj Sharma [Mon, 31 Jan 2011 02:14:40 +0000 (18:14 -0800)]
am
cd73d1ed: Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
* commit '
cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
Fix for issue
3404671 Crash when exporting movie in JNI
Dheeraj Sharma [Mon, 31 Jan 2011 02:12:25 +0000 (18:12 -0800)]
Merge "Fix for issue
3404671 Crash when exporting movie in JNI" into honeycomb
Dianne Hackborn [Mon, 31 Jan 2011 02:05:08 +0000 (18:05 -0800)]
am
260c3c77: Fix issue #
3381489: IllegalStateException: attempt to re-open...
* commit '
260c3c77d9b340164e055f87002c64d78da6e836':
Fix issue #
3381489: IllegalStateException: attempt to re-open...
Dianne Hackborn [Mon, 31 Jan 2011 00:55:55 +0000 (16:55 -0800)]
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
Joe Onorato [Mon, 31 Jan 2011 01:58:47 +0000 (17:58 -0800)]
am
fba54f62: Merge "I declare settings panel icon VICTORY!" into honeycomb
* commit '
fba54f620ff155ede6de7d73f1b6a0003839b1c4':
I declare settings panel icon VICTORY!
Joe Onorato [Mon, 31 Jan 2011 01:56:25 +0000 (17:56 -0800)]
Merge "I declare settings panel icon VICTORY!" into honeycomb
Joe Onorato [Mon, 31 Jan 2011 01:46:32 +0000 (17:46 -0800)]
I declare settings panel icon VICTORY!
Bug:
3396115
Change-Id: I72c46361506ec48bf3ebc9b84dbc476c301ce20c
John Reck [Mon, 31 Jan 2011 01:12:29 +0000 (17:12 -0800)]
am
13934c2d: Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
* commit '
13934c2d71046cdd2e7ca33528b91cb83f82dc13':
Prevent SET_SCROLL_OFFSET spam from clogging tubes
John Reck [Mon, 31 Jan 2011 00:55:23 +0000 (16:55 -0800)]
Merge "Prevent SET_SCROLL_OFFSET spam from clogging tubes" into honeycomb
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:08 +0000 (16:35 -0800)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
Dharmaray Kundargi [Mon, 31 Jan 2011 00:35:03 +0000 (16:35 -0800)]
am
ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '
ff8432548eb96655190486ee0f0fa08de5451e66':
Merging the same files on top of tree.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:34:56 +0000 (16:34 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:32:44 +0000 (16:32 -0800)]
am
1314bdb2: am
e88fa50b: Merge from open-source gingerbread
* commit '
1314bdb2b22ae3613c3e08ae278dbc70f90b965c':
fix failing thread object run
Dharmaray Kundargi [Mon, 31 Jan 2011 00:32:07 +0000 (16:32 -0800)]
Merge "Merging the same files on top of tree." into honeycomb
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
John Reck [Mon, 31 Jan 2011 00:23:09 +0000 (16:23 -0800)]
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
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run