Eino-Ville Talvala
32a972c693
Updates to Camera API documentation.
...
Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
2011-06-07 10:34:56 -07:00
Wu-cheng Li
a4a48a484f
Merge "Improve android.hardware.Camera.Area javadoc."
2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731
Improve android.hardware.Camera.Area javadoc.
...
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
2011-06-07 19:00:03 +08:00
Xia Wang
4da7b10c45
Merge "Add OpenGl benchmark tests: display images with different texture in each mesh."
2011-06-06 22:00:31 -07:00
Dianne Hackborn
b5c462f801
Merge "Add force-stop subcommand for 'am'."
2011-06-06 19:01:48 -07:00
Svetoslav Ganov
8643aa0179
Interrogation of the view hierarchy from an AccessibilityService.
...
1. Views are represented as AccessibilityNodeInfos to AccessibilityServices.
2. An accessibility service receives AccessibilityEvents and can ask
for its source and gets an AccessibilityNodeInfo which can be used
to get its parent and children infos and so on.
3. AccessibilityNodeInfo contains some attributes and actions that
can be performed on the source.
4. AccessibilityService can request the system to preform an action
on the source of an AccessibilityNodeInfo.
5. ViewAncestor provides an interaction connection to the
AccessibiltyManagerService and an accessibility service uses
its connection to the latter to interact with screen content.
6. AccessibilityService can interact ONLY with the focused window
and all calls are routed through the AccessibilityManagerService
which imposes security.
7. Hidden APIs on AccessibilityService can find AccessibilityNodeInfos
based on some criteria. These API go through the AccessibilityManagerServcie
for security check.
8. Some actions are hidden and are exposes only to eng builds for UI testing.
Change-Id: Ie34fa4219f350eb3f4f6f9f45b24f709bd98783c
2011-06-06 18:46:03 -07:00
Iliyan Malchev
219451363d
CameraParameters: add PIXEL_FORMAT_RGBA8888
...
Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-06-06 18:04:17 -07:00
Fabrice Di Meglio
de7fc15ff4
Update BiDiTest app for Gravity renaming
...
- BEFORE?AFTER is now START/END
Change-Id: I44cfdc17090052704024d8c5386553f0c83e9ab2
2011-06-06 17:58:17 -07:00
Fabrice Di Meglio
a556abfb3d
Merge "Rename Gravity BEFORE/AFTER to START/END"
2011-06-06 16:48:30 -07:00
Fabrice Di Meglio
9e3b002d3f
Rename Gravity BEFORE/AFTER to START/END
...
- following spec proposal for having CSS3 like naming
Change-Id: Id5e316a2d9b54b9f20bbcb168fea6a3a83882e1b
2011-06-06 16:41:16 -07:00
Eric Fischer
4297539155
Merge "Import revised translations."
2011-06-06 16:22:35 -07:00
James Dong
6564c3c6ab
Merge "Fix the comment for the location box @xyz"
2011-06-06 15:54:10 -07:00
Eric Fischer
f24004279a
Import revised translations.
...
Change-Id: I02300c0a71373654beb97bc96691438136bd3365
2011-06-06 15:51:43 -07:00
Ben Komalo
98ded72258
Merge "Makes SSLCertificateSocketFactory more flexible"
2011-06-06 15:50:10 -07:00
Xia Wang
62e8f2228f
Add OpenGl benchmark tests:
...
display images with different texture in each mesh.
Change-Id: I051be3cf8be117e62fc635dfaf75b5c0e4cdd644
2011-06-06 15:12:29 -07:00
Ben Komalo
1b52806e21
Makes SSLCertificateSocketFactory more flexible
...
Specifically, this adds support for specifying custom
{Trust,Key}Managers in the socket factory.
Change-Id: I1fdf6587064c71ae0520f73821923dcad8d140ad
2011-06-06 15:10:33 -07:00
Fabrice Di Meglio
890e013c05
Merge "Fix USE_TEXT_LAYOUT_CACHE define"
2011-06-06 14:14:36 -07:00
Martijn Coenen
4e75dbb94d
Merge "Connecting to a NFC technology may fail."
2011-06-06 13:46:47 -07:00
Jeff Brown
49470743fa
Merge "Copy pointer assets for hdpi."
2011-06-06 13:14:13 -07:00
Jeff Brown
44771f14ec
Copy pointer assets for hdpi.
...
Change-Id: I0012c651d8e550bbb0e2c75046f3138f7dd5f6a6
2011-06-06 13:03:25 -07:00
Nick Pelly
2343befbb8
am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
...
* commit '92279c0fa1c15bd4afaf051bed90776fa64744c1':
2011-06-06 12:57:32 -07:00
TK MUN
60a3117838
am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
Allow control over search order for tethering upstream interface selection
2011-06-06 12:57:24 -07:00
Eric Fischer
a959c8ff90
am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
Import revised translations. DO NOT MERGE
2011-06-06 12:57:14 -07:00
Jaikumar Ganesh
830d8c5fb3
am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"
...
* commit '5aaed0970be451479a07b2423e709026dec6611b':
Require bonding and encryption for PBAP server
2011-06-06 12:56:55 -07:00
Jean-Baptiste Queru
cc19d9059f
am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 12:56:29 -07:00
Marco Nelissen
03db358cbc
Merge "resolved conflicts for merge of b2fd84ad to master"
2011-06-06 12:33:40 -07:00
Marco Nelissen
8645017517
resolved conflicts for merge of b2fd84ad to master
...
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
2011-06-06 12:30:40 -07:00
Nick Pelly
92279c0fa1
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-06-06 11:52:21 -07:00
Fabrice Di Meglio
af033caf26
Fix USE_TEXT_LAYOUT_CACHE define
...
- fix compilation issues
Change-Id: I3358457d94d2278804e81e4ca96c9633ed76a147
2011-06-06 11:51:46 -07:00
TK MUN
51704fc9c2
am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection
...
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
Allow control over search order for tethering upstream interface selection
2011-06-06 11:51:22 -07:00
Eric Fischer
e34ed24f4d
am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
Import revised translations. DO NOT MERGE
2011-06-06 11:50:16 -07:00
RoboErik
3ee7a25cb1
Merge "Cleanup of Calendar.java to prep for api"
2011-06-06 11:39:40 -07:00
Jaikumar Ganesh
5aaed0970b
am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"
...
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
59242cf65e
am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 11:33:52 -07:00
Eric Fischer
e9d32283e4
am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
2011-06-06 10:54:41 -07:00
Alex Sakhartchouk
aece2ccccb
Merge "Unhiding render target code for renderscript"
2011-06-06 10:54:26 -07:00
RoboErik
c2d5330c1c
Cleanup of Calendar.java to prep for api
...
Added comments. Made internal only stuff private. Added @hide to
methods only used by the provider. Added/altered methods for
consistency across contract classes.
Change-Id: I4d810995042583f1ab05b859f320828f83329e90
2011-06-06 10:52:33 -07:00
Eric Fischer
b16b020dd3
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-06-06 10:38:42 -07:00
Marco Nelissen
b2fd84ad1d
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp
...
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
2011-06-06 09:55:15 -07:00
John Reck
f7445916c5
Merge "Delay set picture if necessary"
2011-06-06 09:25:44 -07:00
Alex Sakhartchouk
85dae045a2
Unhiding render target code for renderscript
...
Change-Id: I32d80e6c49dbda955402f7ddffdb213c70ddbec9
2011-06-06 09:25:17 -07:00
Glenn Kasten
a093ca9c73
Merge "Remove dead code related to gettid"
2011-06-06 09:12:05 -07:00
Marco Nelissen
5ca271efe9
Merge "Add WebP Mime-Type support in Android Media File"
2011-06-06 08:21:07 -07:00
Martijn Coenen
ea51a4275a
Connecting to a NFC technology may fail.
...
NotSupportedOperationException will be thrown in these cases,
unchecked for now.
Bug: 4195403
Change-Id: I48f4f277d43afba8bc505ae2a6c216cc387b1e97
2011-06-06 12:43:05 +02:00
Shih-wei Liao
40f4efe712
Merge "Fix the false-alarm bug when we skip to the end, which should be OK."
2011-06-05 00:58:40 -07:00
Shih-wei Liao
6e66725e1c
Fix the false-alarm bug when we skip to the end, which should be OK.
...
Fix the bug b/4540617.
Change-Id: I64a77b8c5d89bcd35f81d196928a671c954e9a28
2011-06-05 00:56:22 -07:00
John Reck
83e5929d4c
Delay set picture if necessary
...
Normally this wouldn't happen as a new picture should come after
webcore has initialized. However, now that a view state can be loaded,
setting a new picture needs to be delayed until after everything has
initialized.
Change-Id: I823bc17eb939eab0436d7a398ebcbe849c0fb945
2011-06-04 19:50:29 -07:00
Wink Saville
f9f805c367
Merge "resolved conflict for merge of fc51aaec to master"
2011-06-04 08:19:00 -07:00
Daniel Sandler
f81c70944a
Merge "Fix the status bar test app."
2011-06-04 07:38:08 -07:00
Wink Saville
1b9a6a6e58
resolved conflict for merge of fc51aaec to master
...
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
2011-06-04 07:31:35 -07:00