Svetoslav Ganov
c4df1f6a48
am b5d9b6ae: am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb
...
* commit 'b5d9b6aec8565b13c45ce875d7e7b8e3ea3648f9':
Set time dialog display changes AM/PM at 1 instead of 12
2011-01-31 16:19:07 -08:00
Adam Powell
06a7d2e66e
am 3c7a6174: am 5f639d5a: Merge "Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode" into honeycomb
...
* commit '3c7a617455410c3c164f9aeac522baa94e056651':
Fix bug 3408834 - actionbar stays gone when leaving reader in lightsout mode
2011-01-31 16:19:04 -08:00
Andreas Huber
17ab86cdb1
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
2011-01-31 16:18:49 -08:00
Eric Fischer
3efb315313
am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Svetoslav Ganov
b5d9b6aec8
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
2011-01-31 16:15:26 -08:00
Adam Powell
3c7a617455
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
2011-01-31 16:15:20 -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
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
satok
4d733290a1
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
2011-02-01 09:01:58 +09: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
Dianne Hackborn
f5bf36c443
am 8a92eeb8: (-s ours) am 13684548: (-s ours) am e6c6b760: DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
...
* commit '8a92eeb8d8b27486d81089bfba5f51945ad89b21':
DO NOT MERGE Fix issue #3408542 : "resizeable" attribute required to get out of compat mode
2011-01-31 15:46:05 -08:00
Raphael
3d23e1b8d6
am 60e1eb4b: am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
...
* commit '60e1eb4bfa6205cb2b307f9d2e9858f6e8cbb7ca':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
2011-01-31 15:46:00 -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
Jamie Gennis
f27bbc238c
Merge "Clear all EGL errors when entering EGL funcs."
2011-01-31 15:40:06 -08:00
Jamie Gennis
79d01fe823
Clear GL errors before updating a SurfaceTexture.
...
Change-Id: Ibdac657ae9e9ccae53c63abed9caf1f1513915c2
2011-01-31 15:35:29 -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
Jamie Gennis
c999a4ca96
am 9abd7a33: am b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
...
* commit '9abd7a33009567a5f0da090fbf96f9cde389a7b8':
Add SurfaceTexture docs for getTransformMatrix.
2011-01-31 15:02:46 -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
Jean-Baptiste Queru
74e5fe5909
am 5131763c: am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '5131763c58be3ac78a28532261cdc8fc3af010ef':
stubs
2011-01-31 15:01:25 -08:00
Jamie Gennis
4a702faf5b
am cf675303: am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit 'cf675303927d8008c5952759d534dcc6c0ca3d4a':
Fix a multithreading bug in libagl's EGL.
2011-01-31 15:01:21 -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
Alex Sakhartchouk
d0f5bd130b
Cleaning up the serialization change.
...
Renaming the define to be more in line with what it does and removing the host stub header file.
Change-Id: Ibd3a0a6a398c7f81cc661f71e4478707fe1679ed
2011-01-31 14:53:24 -08:00
Dianne Hackborn
8a92eeb8d8
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
2011-01-31 14:38:24 -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
Raphael
60e1eb4bfa
am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
...
* commit '03245a8ec46acc7c2b24d3d680ea5b88bd89ce13':
LayoutLib.Create: support Outer_Inner_Delegate renaming.
2011-01-31 14:32:56 -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
Raphael
03245a8ec4
Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb
2011-01-31 14:30:28 -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
Jamie Gennis
9abd7a3300
am b799314e: Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
...
* commit 'b799314e64d5afe050aeee394f0c29d7728c1e22':
Add SurfaceTexture docs for getTransformMatrix.
2011-01-31 14:14:50 -08:00
Mike Lockwood
e62e890b68
Merge "MTP: Use ro.product.manufacturer system property value for MTP manufacturer name"
2011-01-31 14:13:30 -08:00
Jamie Gennis
b799314e64
Merge "Add SurfaceTexture docs for getTransformMatrix." into honeycomb
2011-01-31 14:11:26 -08:00
Mike Lockwood
4639532261
MTP: Use ro.product.manufacturer system property value for MTP manufacturer name
...
Previously it was hard coded to "Google, Inc."
BUG: 3405965
Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-31 17:11:24 -05:00
Jamie Gennis
e3b179c732
Clear all EGL errors when entering EGL funcs.
...
This changes the clearError function in the EGL wrapper layer to simply
call eglGetError(). That should clear any pending errors from all the
underlying EGL implementations, which is needed to correctly report the
error for the most recently called EGL function.
Change-Id: Iad19c69f0c5305e873f3c2f96d353280d31f7b61
2011-01-31 14:08:23 -08:00
Jean-Baptiste Queru
5131763c58
am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs"
...
* commit '27badee3f567015183ab584fae1cbd32a996e78d':
stubs
2011-01-31 14:00:52 -08:00
Jamie Gennis
cf67530392
am 8df2c424: Merge "Fix a multithreading bug in libagl\'s EGL." into honeycomb
...
* commit '8df2c42413cfdde1c4290b4797a09c4bafb6c3bc':
Fix a multithreading bug in libagl's EGL.
2011-01-31 13:56:28 -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
Jamie Gennis
8df2c42413
Merge "Fix a multithreading bug in libagl's EGL." into honeycomb
2011-01-31 13:38:27 -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
Raphael
811820f440
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
2011-01-31 13:16:04 -08:00
Jason parks
bd9a08d318
Show the encryption boot animation.
...
Change-Id: I15892a35238d97302b30f26bec170b9f231a3e15
2011-01-31 15:04:43 -06:00