Dan Bornstein
c087a87e01
Fix newlines in this file.
...
They were CRLF instead of just LF.
Change-Id: I2d06d19b4d8ca969527d93bd996103c161e48a79
2010-12-07 16:23:05 -08:00
Dan Bornstein
c086ca1fa7
These files had an older header.
...
This patch replaces the file headers with the approved Android
header text.
Change-Id: I63cbd21e9112dab404158fb65f74bc6ca5b07eac
2010-12-07 15:35:20 -08:00
Adam Powell
11a8af5ea1
Merge "Clean up button bar styles"
2010-12-06 17:41:47 -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
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
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
Xavier Ducrohet
864f33a9f8
Merge "LayoutLib: Update font object when text info changes in paint delegate"
2010-12-06 11:32:43 -08:00
Robert Greenwalt
a2e1339241
Make Proxy change broadcast sticky
...
Makes it easier for apps who care. Includes the current values.
Change-Id: I5f1d3589a036ebc9910281f97d4780ecda2829f2
2010-12-06 11:29:17 -08:00
Guang Zhu
afeffb744f
Merge "change how assets are copied out of apk"
2010-12-06 11:28:49 -08:00
Guang Zhu
0006952a8d
change how assets are copied out of apk
...
Currently test code use getActivity to get DRT's assets. However
the side effect is that this will actually launch the activity.
This is not affecting any tests yet, however there are cleaner
ways to do this. The instrumentation framework provides a
getTargetContext call which will give access to app under test's
context, and therefore granting access to its assets.
Change-Id: I0560b0fa5681f80bcb9296beec3fd0549c40cc8e
2010-12-06 11:24:01 -08:00
Daniel Sandler
2ee1856f81
Merge "Hide navigation buttons and clock on lockscreen."
2010-12-06 11:15:45 -08:00
Xavier Ducrohet
b5ddf041d6
LayoutLib: Update font object when text info changes in paint delegate
...
Change-Id: I6ff7e1ec4513918256aee99acc5ea298a5fdb8a8
2010-12-06 11:12:47 -08:00
Jean-Baptiste Queru
62f6e1d883
am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
2010-12-06 11:05:47 -08:00
Stephen Hines
d4aa7d22f8
Stop using anonymous structs in RS.
...
Change-Id: I90344683939f2934f841031fd5339dbe91cc9e05
2010-12-06 11:04:40 -08:00
Jean-Baptiste Queru
005dd44b75
am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
864b1e007d
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Irfan Sheriff
02047f7e88
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
...
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
2010-12-06 10:42:58 -08:00