Mathias Agopian
9889e2b192
am 0484a673: am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
...
* commit '0484a673c5839d2be9e615e52c6a45febdf1127b':
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
2010-12-06 18:25:58 -08:00
Mathias Agopian
0484a673c5
am daef0a04: Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
...
* commit 'daef0a040de7a9825bdbcba7b2eae66195e3a95f':
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
2010-12-06 18:22:57 -08:00
Mathias Agopian
daef0a040d
Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
2010-12-06 18:20:09 -08:00
Romain Guy
ffac19ede6
Merge "Correctly render text when coordinates are not integers. Bug #3225632 "
2010-12-06 18:08:46 -08:00
Romain Guy
6620c6d413
Correctly render text when coordinates are not integers.
...
Bug #3225632
Change-Id: If09759e6e95eb2885362ab3ba088cf5aae64c7bf
2010-12-06 18:07:02 -08:00
James Dong
97fdd7dcfd
Merge "Log the exception cause for better problem analysis"
2010-12-06 17:50:20 -08:00
Nick Pelly
7458091ffc
am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
...
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
2010-12-06 17:48:38 -08:00
Mindy Pereira
d9e37dfacc
Merge "Make webview edges behave the same way abslistview overscroll edges do."
2010-12-06 17:47:11 -08:00
Nick Pelly
ea294903ca
am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
...
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
2010-12-06 17:45:25 -08:00
Nick Pelly
eba947a32a
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
2010-12-06 17:43:46 -08:00
Adam Powell
11a8af5ea1
Merge "Clean up button bar styles"
2010-12-06 17:41:47 -08:00
Nick Pelly
35042f1f58
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
...
ACTION_TAG_DISCOVERED is a start activity intent, not a broadcast intent, so
its presence in this list is redundant.
Change-Id: I05419ec9c4471b7b11c9ae50a02e5ac3d9e572d2
2010-12-06 17:32:59 -08:00
Dan Bornstein
8da8fc1f36
Merge "Propagate the concept of "packed opcode" values."
2010-12-06 17:25:44 -08:00
Scott Main
99108e7192
Merge "cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a Do not merge: Doc change: API diff report for gingerbread."
2010-12-06 17:24:24 -08:00
Adam Powell
cf0357639e
Clean up button bar styles
...
Change-Id: I65b6600f72b92db024f83b63d3ea91abc1cbb96c
2010-12-06 17:23:26 -08:00
Scott Main
17b2302f36
Merge "cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563 Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform."
2010-12-06 17:22:48 -08:00
Mindy Pereira
3331f2be93
Make webview edges behave the same way abslistview overscroll edges do.
...
The assets are not scaled to start before the left or after the
right edge of the view.
For the top edge, start the canvas for rendering the glow
after the title bar (if it is visible) or most of the glow
gets cut off.
Change-Id: Ia1a513fda4d1106d671919bb289aa83f8800c2c2
2010-12-06 17:22:42 -08:00
Dirk Dougherty
e2482507ff
cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a
...
Do not merge: Doc change: API diff report for gingerbread.
Change-Id: Ib6d916f76614ddcb80760fb89f6bb3d7d66344b8
2010-12-06 17:02:36 -08:00
Dirk Dougherty
904785be3b
cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563
...
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
Change-Id: Iac08560728b3c6783ee6fcbd31ec6aca58b156d3
2010-12-06 16:57:09 -08:00
Robert Greenwalt
6dcc906c45
Merge "Make Proxy change broadcast sticky"
2010-12-06 16:51:32 -08:00
James Dong
e01af4dea3
am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames may not be released
...
* commit '23b791cd0f725d188b84dabfd9eeab4e3775b869':
Fixed a race condition where some recording frames may not be released
2010-12-06 16:45:08 -08:00
Jean-Baptiste Queru
4c240a2cd1
am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
Changing connect and response timeout.
2010-12-06 16:44:50 -08:00
Dan Bornstein
b96f58911e
Propagate the concept of "packed opcode" values.
...
Dalvik now exposes a distinction between "packed" and regular opcode
values. The packed values are more densely defined in the range 0-0x1ff,
whereas the regular values are sparsely defined across the range 0-0xffff.
The only current use for packed values at this level is in opcode
usage reporting, but their use may expand over time.
Change-Id: Ie783b90cb2dcb9df8f3eb19a7c708a53906fdbe4
2010-12-06 16:02:12 -08:00
James Dong
23b791cd0f
am d57fbe88: Fixed a race condition where some recording frames may not be released
...
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
2010-12-06 15:36:04 -08:00
Brian Carlstrom
03b758ef99
Merge "Tracking dalvik.bytecode.* API changes"
2010-12-06 15:30:34 -08:00
Brian Carlstrom
ab551531d8
Tracking dalvik.bytecode.* API changes
...
Change-Id: Id27a57cbc760bd56a8b49f287bab1f8eee20f2c4
2010-12-06 15:24:33 -08:00
Jesse Wilson
ee3567558f
Merge "Test that we use proxies specified by system properties."
2010-12-06 15:24:28 -08:00
Fred Quintana
376ee8263f
Merge "make sure that pending operation reconstituted from disk always have an extras bundle"
2010-12-06 15:18:58 -08:00
Jesse Wilson
10733a71c5
Test that we use proxies specified by system properties.
...
This tests that we use the properties and also that the
precedence prefers client and request properties.
Change-Id: I480dacaf373e3ddd7642d3c918fa50695b36cdba
http://b/3254717
2010-12-06 15:10:11 -08:00
Fred Quintana
5695c7b4e5
make sure that pending operation reconstituted from disk
...
always have an extras bundle
Bug:3226463
Change-Id: I16db632e0be1e75a77853394f716d4c47c08359e
2010-12-06 15:09:32 -08:00
James Dong
d57fbe887f
Fixed a race condition where some recording frames may not be released
...
bug - 3258924
Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
2010-12-06 15:05:06 -08:00
James Dong
25d7094279
Log the exception cause for better problem analysis
...
Change-Id: Ia1f81adb6fc3be87098c9399509b68d5daf7f2da
2010-12-06 14:41:00 -08:00
Jean-Baptiste Queru
bfd4c5fe84
Merge "Merge from gingerbread-plus-aosp"
2010-12-06 14:33:03 -08:00
Wei-Ta Chen
b9e56bb345
Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options."
2010-12-06 14:32:32 -08:00
Jean-Baptiste Queru
f0ef665299
Merge from gingerbread-plus-aosp
...
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
2010-12-06 14:31:25 -08:00
Wei-Ta Chen
953f9094a2
Add inPreferQualityOverSpeed into BitmapFactory.Options.
...
The new field allows a developer to use a more accurate by
slightly slower IDCT method in JPEG decode. This in turns improves the
quality of the reconstructed image.
The field by default is not set and thus does not affect existing
applications.
Bug: 3238925
Change-Id: I93d55b7226e47a43e639325cd1a677694d6f2ee4
2010-12-06 14:24:51 -08:00
Jean-Baptiste Queru
b62102fe59
Merge "Merge from gingerbread-plus-aosp"
2010-12-06 14:21:07 -08:00
James Dong
0efe974ee6
Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
2010-12-06 14:18:18 -08:00
Jean-Baptiste Queru
50a2a8765a
Merge from gingerbread-plus-aosp
...
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
2010-12-06 14:08:53 -08:00
Gilles Debunne
9df964fa3f
Merge "Moved Paste popup window up in TextView"
2010-12-06 13:57:47 -08:00
Jean-Baptiste Queru
465e88eb00
am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
1ee2394edd
am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
1d67fa5b11
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Irfan Sheriff
268d6afd8f
Merge "Update scan results when frequency band is set"
2010-12-06 12:47:31 -08:00
Gilles Debunne
1cafde04c5
Moved Paste popup window up in TextView
...
Bug 3228601
A tap on the insertion handle displays the paste popup immediately.
Tapping again hides the popup.
Bug 3248651
Change-Id: I5a501b3ebe36e23cbbf0f1b3d588884c6ecd1d56
2010-12-06 12:37:24 -08:00
Irfan Sheriff
cf34f47edd
Update scan results when frequency band is set
...
Change-Id: I4864b66f96744682a0de274fd49cca035ffc5d3c
2010-12-06 12:07:36 -08:00
Nick Pelly
4704982960
am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
2010-12-06 11:55:08 -08:00
Nick Pelly
089c3c7c0b
resolved conflicts for merge of 28e8c66d to master
...
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
2010-12-06 11:50:47 -08:00
Guang Zhu
38dab454d1
Merge "disable HW acceleration"
2010-12-06 11:36:54 -08:00
Guang Zhu
b05deade05
disable HW acceleration
...
currently DRT will block upon launch if HW acceleration is enabled. see
b/3255765.
Change-Id: I19f2e6a6673a0284fd4916370b06aa80e04df4d2
2010-12-06 11:34:14 -08:00