55536 Commits

Author SHA1 Message Date
Scott Main
4d1e80f8f3 Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve issue 5044273 and fix markup error" 2011-07-27 12:32:40 -07:00
Scott Main
34235c6ede cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e
docs: resolve issue 5044273 and fix markup error

Change-Id: Ic028292245c14cca218ea9ac771f292254577e7c
2011-07-27 12:27:39 -07:00
Scott Main
3fcc06e89b Merge "cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e docs: fix issue 5048214 and clarify some variable names" 2011-07-27 12:26:45 -07:00
Scott Main
04142bba6b cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e
docs: fix issue 5048214 and clarify some variable names

Change-Id: Id142fe561690376783e0ec8af23a4f26df785e39
2011-07-27 12:25:36 -07:00
Scott Main
6397b07f73 Merge "cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b update version code to 3.2 for docs footer" 2011-07-27 12:24:50 -07:00
Dianne Hackborn
f2fa907e1f Merge "Fix issue #4466531: onServiceConnected() not called after..." 2011-07-27 12:19:40 -07:00
Scott Main
c7bf44d9f7 cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b
update version code to 3.2 for docs footer

Change-Id: Ia62622383fe73c3e62fa9856ef9742327029be5c
2011-07-27 12:12:51 -07:00
Scott Main
ffcbe48d06 cherrypick Change-Id: I4b79345daeec7087581b459e75f24f0f1b8d7252
docs: a few edits to support library release notes

Change-Id: I30746a4a92f70ff7a84e7f4c6f9c82b04d6776b8
2011-07-27 12:10:03 -07:00
Scott Main
aecaf93ce3 cherrypick Change-Id: Id634f16b9498584932e101934fc60648ee469783
docs: update support lib doc for r3

Change-Id: I11e7efa89c8c7cc6f96609cf98569387dedf573b
2011-07-27 12:08:15 -07:00
Scott Main
93493d459d cherrypick Change-Id: Ibb49b9579902ee2887470e3bcc4f400ac97a51c3
docs: update homepage for 3.2 and market client

Change-Id: I01144e3fd91298266b66f03987ac6a3fd4a8f0c8
2011-07-27 12:01:08 -07:00
Scott Main
759c893225 Change-Id: I2134948e83bdca3f85c501b5d4f65c1c630f1b85
docs: revise the supporting screens doc for more clarification
2011-07-27 11:59:17 -07:00
Scott Main
2e6c04b460 Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break" 2011-07-27 11:58:10 -07:00
Scott Main
20956baf92 Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build" 2011-07-27 11:58:01 -07:00
Scott Main
2c03247b90 cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0
fix doc break

Change-Id: I8bc19538145e5436128ecbe632d6ecd20ea8ab7a
2011-07-27 11:57:15 -07:00
Scott Main
ff8ba6533e cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3
fix sdk build

Change-Id: I5095cb2413abc08fbf5c8965f3f27bff2a8b2d68
2011-07-27 11:56:27 -07:00
Scott Main
44ec74db19 cherrypick Change-Id: Ib2decf325271c50cac3202bad8c4bbbc40d233f2
docs: add tvdpi info
also resolve issue 5018379 with more info about how size resources are selected

Change-Id: Ib16d4ba81e4ff8ab798bcdfcfc4e086fedac5a1a
2011-07-27 11:52:06 -07:00
Scott Main
31675e4295 Merge "cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c docs: add info to plural strings about using string formats" 2011-07-27 11:51:16 -07:00
Jeff Brown
5ea29ab7ef Reset input dispatcher targets when focus changes apps.
This fixes an issue where an ANR can occur in a newly focused
application through no fault of its own, simply because
the previous app took a little while to transfer focus to
the new app.

Bug: 4584620
Change-Id: If3227eb68d92a09a108e9de7f0afcbd9a5dbdead
2011-07-27 11:50:51 -07:00
Scott Main
71825f49d7 cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c
docs: add info to plural strings about using string formats

Change-Id: Id02c3ed8215869724092ce143e71142238098358
2011-07-27 11:50:00 -07:00
Scott Main
91f6ae57f7 Merge "cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 docs: fix shapedrawable doc error issue 5030364" 2011-07-27 11:49:22 -07:00
Scott Main
56def45c1e cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01
docs: fix shapedrawable doc error
issue 5030364

Change-Id: I5bc56eb659eabd7e5069d1d7b9c4884f387a61ad
2011-07-27 11:48:22 -07:00
Scott Main
1d66510ea9 Merge "cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 docs: add k-touch driver id" 2011-07-27 11:47:48 -07:00
Scott Main
3e485d07a4 cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299
docs: add k-touch driver id

Change-Id: I78a36ead667db734a6a4ceb016176a9b1e3bd616
2011-07-27 11:46:54 -07:00
Scott Main
6c71b63dc6 Merge "cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 docs: update Support Mult Screens for MR2 features" 2011-07-27 11:36:44 -07:00
Scott Main
db909162b2 cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299
docs: update Support Mult Screens for MR2 features

Change-Id: Ibab5e60c05c71d58f11daa6f48894011b3e31509
2011-07-27 11:35:17 -07:00
Eric Laurent
b5eba903b8 Merge "Issue 3370834: No Echo canceler for SIP" 2011-07-27 11:34:36 -07:00
Guang Zhu
7e7e18e482 Merge "Disable Crankshaft in DRT for performance testing." 2011-07-27 11:33:40 -07:00
Mathias Agopian
913a5a3cc6 DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
2011-07-27 11:31:57 -07:00
Scott Main
36193d09a8 cherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8
docs: revise ActionBar class summary and add a few links to dev guide docs

Change-Id: I14df84b16d7bdab85aa74d8b8211e988b0519115
2011-07-27 11:21:33 -07:00
Chris Craik
e3e7a88b4d Use WebTextView overlay to render text fields/areas much faster
bug:5008210

Still has the following issues:

* colors are always black & white

* ignores centering, word wrap from text area

* gray background text (such as with instant search) and other textfield effects
  aren't shown

The DebugFlags.DRAW_WEBTEXTVIEW can still be used to overlay red text over the
input box.

Change-Id: I7f22321c31b9edbc5351cac13f2e17b0ee19d563
2011-07-27 11:19:14 -07:00
Mike Lockwood
636250028d Merge "Fix USB tethering again" 2011-07-27 11:05:10 -07:00
Mike Lockwood
485861c409 Fix USB tethering again
The kernel sends an interface down event for usb0 when RNDIS is enabled.
Ignore this and only remove USB interfaces when we receive the
interface removed event.

Change-Id: I1458f259b96c9fab4d3a69a5692e630123fad136
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-27 13:54:29 -04:00
Amith Yamasani
84935dc2c0 Merge "Make sure that suggestions are queried on focus or tapping." 2011-07-27 10:54:15 -07:00
Amith Yamasani
377fe39329 Merge "Handle callbacks to CollapsibleActionViews that are in an actionLayout." 2011-07-27 10:53:25 -07:00
The Android Open Source Project
c3d708e1ab Reconcile with gingerbread-mr4-release
Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23
2011-07-27 10:42:40 -07:00
Bill Gruber
304b8dc4e1 Merge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates" 2011-07-27 10:29:57 -07:00
Bill Gruber
2b8af620de Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 sdk doc change: updated intro to developing and removed reference to G1 Bug: 4483863" 2011-07-27 10:29:47 -07:00
Robert Ly
8191f510b5 Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51" 2011-07-27 10:27:59 -07:00
Robert Ly
0fa3d7012f Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4" 2011-07-27 10:27:53 -07:00
Robert Ly
b04d0d36cc Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b" 2011-07-27 10:27:46 -07:00
Robert Ly
d6fea51121 Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989" 2011-07-27 10:27:39 -07:00
Robert Ly
a3ac673b70 Merge "cherrypick from hc-mr2 Change-Id: Iab11fd9bf007d2e2dcfd7b26a6b8539ed35cf60e" 2011-07-27 10:27:31 -07:00
Glenn Kasten
6ff9b812ab Bug 4599730 Get audio channel count on MediaPlayer
Related changes:
 - Fix bug in get/setParameter* to recycle Parcels when done with them.

Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
2011-07-27 10:21:09 -07:00
Robert Greenwalt
97bd1aef03 Merge "resolved conflicts for merge of af75fdb1 to master" 2011-07-27 10:17:26 -07:00
Iliyan Malchev
bbe9cb4f5f libstagefright: add destroyOMXPlugin and use C linkage for symbols
Add a destroyOMXPlugin() to complemenet createOMXPlugin().  Since the latter is
an opaque call into a library, it is not safe to assume that the object thus
returned may be destroyed by calling delete.  This patch will call
destroyOMXPlugin() in libstagefrighthw.so, if the symbol is defined there.
Otherwise, it will default to a delete as before.

Also, prefer C linkage for the symbol names.  Using mangled C++ symbols is not
very safe and makes it hard to grep for those symbols through the code.  We
attempt to locate createOMXPlugin as a C symbol then try it as a mangled C++
one.  We only use C linkage for destroyOMXPlugin since this symbol is new.

Change-Id: Ied23c910486856a0f18056df049c871234797c5c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-07-27 10:03:43 -07:00
Iliyan Malchev
f7b3e2e215 libcameraservice: call put_parameters on camera HAL
Change-Id: I492d1034ade50f9e157141debaa9783a90a04a91
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-07-27 10:03:43 -07:00
Robert Greenwalt
c59c6da9ae resolved conflicts for merge of af75fdb1 to master
Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129
2011-07-27 10:00:36 -07:00
Bill Gruber
10914d5f8b Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07
sdk doc change: updated intro to developing and removed reference to G1
Bug: 4483863

Change-Id: Ic8d342145ed909ee5592e93a3055887e478a5688
2011-07-27 09:58:02 -07:00
Alex Sakhartchouk
804b3d76c3 Merge "Add getName to renderscript base object" 2011-07-27 09:50:35 -07:00
Bill Gruber
32db3fc25b Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536facf099f
IAB docs: fixes and updates

Change-Id: I0a9d782a83ca16b27c3e90f7bfc19bb9bca5e908
2011-07-27 09:50:26 -07:00