55662 Commits

Author SHA1 Message Date
Glenn Kasten
43a5d6e541 Merge "Bug 4599730 Get audio channel count on MediaPlayer" 2011-07-27 14:45:28 -07:00
Isaac Levy
4ad39d6ac1 Will not disable wifi on wifi-only devices.
- Turn off watchdog by default on wifi-only devices, b/5073657
- Do not disable wifi networks if connectivity manager reports
no mobile connection.

Change-Id: I835e753624fc5e447081cde473039011721112c6
2011-07-27 14:39:33 -07:00
Irfan Sheriff
f92fbc5daf Merge "Run hostapd on a seperate thread" 2011-07-27 14:20:21 -07:00
Jason Sams
a12036bc97 Merge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach." 2011-07-27 14:19:58 -07:00
Jason Sams
4575a8e4de Add const to matrix by vector multiply routines.
Cleanup ifdef for rsForEach.

Change-Id: Id0d053f5dc73fef7dffed57ed02e90340b6cb798
2011-07-27 14:10:53 -07:00
Xavier Ducrohet
ccb722d5aa am 64994077: (-s ours) am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '64994077347276fba4fe2eb1719c7dd2c2105073':
  DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:08:27 -07:00
Xavier Ducrohet
6499407734 am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
  DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:03:35 -07:00
Xavier Ducrohet
c682559d3c am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
  DO NOT MERGE. may fix build on some version of gcc
2011-07-27 14:01:23 -07:00
Xavier Ducrohet
4d21c7732c am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc
2011-07-27 13:59:57 -07:00
Xavier Ducrohet
4d1fa60bfe Merge "DO NOT MERGE. may fix build on some version of gcc" 2011-07-27 13:45:05 -07:00
Scott Main
5465e054d3 cherrypick Change-Id: I3f72534db2944ff447da8f6564ad0cfd1b6674f0
docs: add release notes to several platforms for rendering library updates

Change-Id: I44f8dca5be10d945c044307a694fc2f254b40d8f
2011-07-27 13:38:20 -07:00
Scott Main
541d1b9883 cherrypick Change-Id: Ibbbb2a9ba9c4d6c72c8781027850726ba7c548e0
docs: add new orientation types.
issue 5050865

Change-Id: Idcc557734dbaa4e5631fb7459905cd4bd69a2581
2011-07-27 13:37:01 -07:00
Scott Main
ca4cc3cf65 cherrypick Change-Id: I9f4688a7eb3dfc22f423c114befc665f7f83f168
docs: add JNI Tips doc to the dev guide sidenav

Change-Id: I7522ba8bcad96d5c424f7e894e62ceb700df3027
2011-07-27 13:35:04 -07:00
Scott Main
de8a90ce51 Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify framelayout class summary, issue 5055437" 2011-07-27 13:34:12 -07:00
Daniel Sandler
88d6877223 Restore status icons to former size & opacity on tablets.
Bug: 5086130
Change-Id: Ie1d86f8d40882d0f8193a85295a5a45ce0fe53c5
2011-07-27 16:33:39 -04:00
Scott Main
812634c236 cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3
docs: clarify framelayout class summary, issue 5055437

Conflicts:

	core/java/android/view/View.java
	core/java/android/widget/FrameLayout.java

Change-Id: Ia446d2d4cc798757d7aea104cfaf75fc2315dc50
2011-07-27 13:22:35 -07:00
Christopher Tate
3c6c3ddb6a Merge "Don't actually try to stop processes marked 'persistent'" 2011-07-27 12:41:42 -07:00
Scott Main
88409f84bf Merge "cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782 docs: add documentation about market multiple apk support" 2011-07-27 12:35:48 -07:00
Scott Main
56e1debe92 cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782
docs: add documentation about market multiple apk support

Change-Id: I65815f86890ca51009bdcfa89ab7733bba2881eb
2011-07-27 12:34:48 -07:00
Scott Main
90334b8d67 Merge "cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e docs: clarify that the market app responds to http urls" 2011-07-27 12:34:24 -07:00
Scott Main
1698fd608c cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e
docs: clarify that the market app responds to http urls

Change-Id: Ie9afca5d2e3072bd85c4eb7da1debbf1b5ec02a0
2011-07-27 12:33:10 -07:00
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
Amith Yamasani
6a7421ba94 Don't submit a query if it's whitespace only.
Just to maintain backward compatibility. It's not documented that a space
is not a valid query, but it does make sense to expect that.
Bug: 5079755

Also avoid showing an x by an empty query, by having the SearchDialog simulate an ActionBar.

Change-Id: I3a9332286a439b659e179a249587c491ef29e5c1
2011-07-27 11:55:53 -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