OSDN Git Service

android-x86/frameworks-base.git
13 years agoam 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
Wink Saville [Thu, 28 Jul 2011 03:41:23 +0000 (20:41 -0700)]
am 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE

* commit '5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe':
  Support of LTE Only mode

13 years agoam d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
Wink Saville [Thu, 28 Jul 2011 03:39:09 +0000 (20:39 -0700)]
am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE

* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
  Support of LTE Only mode

13 years agoMerge "Support of LTE Only mode" into honeycomb-LTE
Wink Saville [Thu, 28 Jul 2011 03:35:52 +0000 (20:35 -0700)]
Merge "Support of LTE Only mode" into honeycomb-LTE

13 years agoSupport of LTE Only mode
Ramesh Sudini [Thu, 28 Jul 2011 03:33:19 +0000 (20:33 -0700)]
Support of LTE Only mode

In CDMA-LTE hybrid mode, the service state is derived based on
CDMA state. However, CDMA radio is off while in LTE only mode
so thre will be no signal bar or data type icon displayed on
the status UI.

This patch handles LTE only mode scenario. The service state
is derived from LTE if CDMA is OOS and LTE only mode is used.

Bug: 5070240
Change-Id: Ie55daaf9eea1b16ca73312ebab208810b145d2bc

13 years agoMerge "Reclaim more memory, more often."
Romain Guy [Thu, 28 Jul 2011 01:53:32 +0000 (18:53 -0700)]
Merge "Reclaim more memory, more often."

13 years agoReclaim more memory, more often.
Romain Guy [Thu, 28 Jul 2011 01:51:50 +0000 (18:51 -0700)]
Reclaim more memory, more often.

Yay.

Change-Id: I04557ad575c307a55088549f48f0e9ad994b7275

13 years agoam 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:43:32 +0000 (18:43 -0700)]
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
  Remove Debug Code

13 years agoam 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:40:49 +0000 (18:40 -0700)]
am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
  Remove Debug Code

13 years agoam cd01ad7c: am 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:38:50 +0000 (18:38 -0700)]
am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code

13 years agoam 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:36:17 +0000 (18:36 -0700)]
am 20339b24: Merge "Remove Debug Code"

* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code

13 years agoMerge "Unhide APIs for user space VPN."
Chia-chi Yeh [Thu, 28 Jul 2011 01:35:51 +0000 (18:35 -0700)]
Merge "Unhide APIs for user space VPN."

13 years agoMerge "Fix uses of all-subdir-makefiles"
Ying Wang [Thu, 28 Jul 2011 01:29:26 +0000 (18:29 -0700)]
Merge "Fix uses of all-subdir-makefiles"

13 years agoMerge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:26:01 +0000 (18:26 -0700)]
Merge "Remove Debug Code"

13 years agoMerge "Grant AID_NET_BW_STATS to system service."
Jeff Sharkey [Thu, 28 Jul 2011 01:09:42 +0000 (18:09 -0700)]
Merge "Grant AID_NET_BW_STATS to system service."

13 years agoRemove Debug Code
Josiah Gaskin [Thu, 28 Jul 2011 00:45:32 +0000 (17:45 -0700)]
Remove Debug Code

This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.

Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056

13 years agoAdded ACCOUNT_TYPE_AND_DATA_SET pseudo-column.
Dave Santoro [Mon, 25 Jul 2011 23:44:45 +0000 (16:44 -0700)]
Added ACCOUNT_TYPE_AND_DATA_SET pseudo-column.

This was added to simplify some logic in the provider and app, as
there are places that can simply compare the concatenation of the
account type and data set.

Also added a DATA_SET extra for contact creation, to allow for this
value to be passed around via intents.

Bug 5077096

Change-Id: Ia0634cfcf4590fd90ccb5cb99360c38c86f08d25

13 years agoFix uses of all-subdir-makefiles
Ying Wang [Wed, 27 Jul 2011 23:59:08 +0000 (16:59 -0700)]
Fix uses of all-subdir-makefiles

We should use all-makefiles-under instead.
all-subdir-makefiles can be used only before any "include" statement.
Before this change, both subdirs were actually not included.

Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f

13 years agoMerge "Bug 4571327: error popup empty when displayed on top"
Gilles Debunne [Wed, 27 Jul 2011 23:47:26 +0000 (16:47 -0700)]
Merge "Bug 4571327: error popup empty when displayed on top"

13 years agoMerge "Restore status icons to former size & opacity on tablets."
Daniel Sandler [Wed, 27 Jul 2011 23:36:11 +0000 (16:36 -0700)]
Merge "Restore status icons to former size & opacity on tablets."

13 years agoam 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.
Ramesh Sudini [Wed, 27 Jul 2011 23:35:41 +0000 (16:35 -0700)]
am 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.

* commit '8ce53e387e2b4427265ae9e43bc15d9fe850643d':
  DataConnection: Clear cid when entering inactive state.

13 years agoam 9a87deb5: DataConnection: Clear cid when entering inactive state.
Ramesh Sudini [Wed, 27 Jul 2011 23:32:48 +0000 (16:32 -0700)]
am 9a87deb5: DataConnection: Clear cid when entering inactive state.

* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
  DataConnection: Clear cid when entering inactive state.

13 years agoMerge "Destroy layers and flush layers cache when a window is destroyed."
Romain Guy [Wed, 27 Jul 2011 23:31:19 +0000 (16:31 -0700)]
Merge "Destroy layers and flush layers cache when a window is destroyed."

13 years agoGrant AID_NET_BW_STATS to system service.
Jeff Sharkey [Wed, 27 Jul 2011 23:30:00 +0000 (16:30 -0700)]
Grant AID_NET_BW_STATS to system service.

NetworkManagementService is reading stats /proc/ files, which are now
being protected by GID.

Bug: 5087530
Change-Id: I29b35a97ab621999544b6acc8ad4cf72ee053b79

13 years agoDestroy layers and flush layers cache when a window is destroyed.
Romain Guy [Wed, 27 Jul 2011 23:28:21 +0000 (16:28 -0700)]
Destroy layers and flush layers cache when a window is destroyed.

Change-Id: I3fa1bc3ff50fb99e3d2e490925bd6b0a0f809fff

13 years agoMerge "Will not disable wifi on wifi-only devices."
Irfan Sheriff [Wed, 27 Jul 2011 23:09:18 +0000 (16:09 -0700)]
Merge "Will not disable wifi on wifi-only devices."

13 years agoMerge "Reset input dispatcher targets when focus changes apps."
Jeff Brown [Wed, 27 Jul 2011 22:54:57 +0000 (15:54 -0700)]
Merge "Reset input dispatcher targets when focus changes apps."

13 years agoMerge "Move extract native libraries to JNI code"
Kenny Root [Wed, 27 Jul 2011 22:54:51 +0000 (15:54 -0700)]
Merge "Move extract native libraries to JNI code"

13 years agoMerge "Report the external display size to the input reader."
Jeff Brown [Wed, 27 Jul 2011 22:54:50 +0000 (15:54 -0700)]
Merge "Report the external display size to the input reader."

13 years agoMerge "Handle stylus buttons and tool types."
Jeff Brown [Wed, 27 Jul 2011 22:54:41 +0000 (15:54 -0700)]
Merge "Handle stylus buttons and tool types."

13 years agoMerge "Change ZipFile flags anonymous enum"
Kenny Root [Wed, 27 Jul 2011 22:54:39 +0000 (15:54 -0700)]
Merge "Change ZipFile flags anonymous enum"

13 years agoMerge "Drop hack for drivers that emit zero ABS_MT_TOUCH_MAJOR. Bug: 5064702"
Jeff Brown [Wed, 27 Jul 2011 22:54:35 +0000 (15:54 -0700)]
Merge "Drop hack for drivers that emit zero ABS_MT_TOUCH_MAJOR. Bug: 5064702"

13 years agoMerge "Revise data limit notifs, watch kernel alerts."
Jeff Sharkey [Wed, 27 Jul 2011 22:52:24 +0000 (15:52 -0700)]
Merge "Revise data limit notifs, watch kernel alerts."

13 years agoMerge "UsbDeviceManager: Don't show USB notification for RNDIS"
Mike Lockwood [Wed, 27 Jul 2011 22:49:05 +0000 (15:49 -0700)]
Merge "UsbDeviceManager: Don't show USB notification for RNDIS"

13 years agoMerge "Bug 5076788 - Optimize the building and invalidation of menus"
Adam Powell [Wed, 27 Jul 2011 22:47:04 +0000 (15:47 -0700)]
Merge "Bug 5076788 - Optimize the building and invalidation of menus"

13 years agoMerge "Use WebTextView overlay to render text fields/areas much faster"
Chris Craik [Wed, 27 Jul 2011 22:46:44 +0000 (15:46 -0700)]
Merge "Use WebTextView overlay to render text fields/areas much faster"

13 years agoBug 5076788 - Optimize the building and invalidation of menus
Adam Powell [Wed, 27 Jul 2011 18:55:29 +0000 (11:55 -0700)]
Bug 5076788 - Optimize the building and invalidation of menus

Fix cases that weren't batching menu presenter changes correctly.

Have FragmentManager invalidate the options menu less often.

Change-Id: Ia66fcd09ada8b0a084ad6b08d4340a8fa0c8fc5d

13 years agoMerge "Not user generated accessibility events can change the interrogation allowing...
Svetoslav Ganov [Wed, 27 Jul 2011 22:24:10 +0000 (15:24 -0700)]
Merge "Not user generated accessibility events can change the interrogation allowing window."

13 years agoDataConnection: Clear cid when entering inactive state.
Ramesh Sudini [Wed, 27 Jul 2011 20:36:54 +0000 (15:36 -0500)]
DataConnection: Clear cid when entering inactive state.

Bug: 5083242

Change-Id: I0657739da54bc424433063a2244d045e47411e5f

13 years agoMerge "Bug 4599730 Get audio channel count on MediaPlayer"
Glenn Kasten [Wed, 27 Jul 2011 21:45:28 +0000 (14:45 -0700)]
Merge "Bug 4599730 Get audio channel count on MediaPlayer"

13 years agoWill not disable wifi on wifi-only devices.
Isaac Levy [Wed, 27 Jul 2011 01:59:12 +0000 (18:59 -0700)]
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

13 years agoMerge "Run hostapd on a seperate thread"
Irfan Sheriff [Wed, 27 Jul 2011 21:20:21 +0000 (14:20 -0700)]
Merge "Run hostapd on a seperate thread"

13 years agoMerge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach."
Jason Sams [Wed, 27 Jul 2011 21:19:58 +0000 (14:19 -0700)]
Merge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach."

13 years agoAdd const to matrix by vector multiply routines.
Jason Sams [Wed, 27 Jul 2011 21:10:53 +0000 (14:10 -0700)]
Add const to matrix by vector multiply routines.
Cleanup ifdef for rsForEach.

Change-Id: Id0d053f5dc73fef7dffed57ed02e90340b6cb798

13 years agoam 64994077: (-s ours) am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours...
Xavier Ducrohet [Wed, 27 Jul 2011 21:08:27 +0000 (14:08 -0700)]
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

13 years agoam c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may...
Xavier Ducrohet [Wed, 27 Jul 2011 21:03:35 +0000 (14:03 -0700)]
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

13 years agoam 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some versio...
Xavier Ducrohet [Wed, 27 Jul 2011 21:01:23 +0000 (14:01 -0700)]
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

13 years agoam 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
Xavier Ducrohet [Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)]
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

13 years agoMerge "DO NOT MERGE. may fix build on some version of gcc"
Xavier Ducrohet [Wed, 27 Jul 2011 20:45:05 +0000 (13:45 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc"

13 years agocherrypick Change-Id: I3f72534db2944ff447da8f6564ad0cfd1b6674f0
Scott Main [Wed, 27 Jul 2011 01:29:44 +0000 (18:29 -0700)]
cherrypick Change-Id: I3f72534db2944ff447da8f6564ad0cfd1b6674f0
docs: add release notes to several platforms for rendering library updates

Change-Id: I44f8dca5be10d945c044307a694fc2f254b40d8f

13 years agocherrypick Change-Id: Ibbbb2a9ba9c4d6c72c8781027850726ba7c548e0
Scott Main [Thu, 21 Jul 2011 21:57:40 +0000 (14:57 -0700)]
cherrypick Change-Id: Ibbbb2a9ba9c4d6c72c8781027850726ba7c548e0
docs: add new orientation types.
issue 5050865

Change-Id: Idcc557734dbaa4e5631fb7459905cd4bd69a2581

13 years agocherrypick Change-Id: I9f4688a7eb3dfc22f423c114befc665f7f83f168
Scott Main [Thu, 21 Jul 2011 18:16:40 +0000 (11:16 -0700)]
cherrypick Change-Id: I9f4688a7eb3dfc22f423c114befc665f7f83f168
docs: add JNI Tips doc to the dev guide sidenav

Change-Id: I7522ba8bcad96d5c424f7e894e62ceb700df3027

13 years agoMerge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify...
Scott Main [Wed, 27 Jul 2011 20:34:12 +0000 (13:34 -0700)]
Merge "cherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3 docs: clarify framelayout class summary, issue 5055437"

13 years agoRestore status icons to former size & opacity on tablets.
Daniel Sandler [Wed, 27 Jul 2011 20:33:09 +0000 (16:33 -0400)]
Restore status icons to former size & opacity on tablets.

Bug: 5086130
Change-Id: Ie1d86f8d40882d0f8193a85295a5a45ce0fe53c5

13 years agocherrypick Change-Id: I213711f4b5d867ba91c961a2f098b6cc415cfcb3
Scott Main [Wed, 27 Jul 2011 20:22:35 +0000 (13:22 -0700)]
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

13 years agoMerge "Don't actually try to stop processes marked 'persistent'"
Christopher Tate [Wed, 27 Jul 2011 19:41:42 +0000 (12:41 -0700)]
Merge "Don't actually try to stop processes marked 'persistent'"

13 years agoMerge "cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782 docs: add...
Scott Main [Wed, 27 Jul 2011 19:35:48 +0000 (12:35 -0700)]
Merge "cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782 docs: add documentation about market multiple apk support"

13 years agocherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782
Scott Main [Wed, 18 May 2011 01:46:27 +0000 (18:46 -0700)]
cherrypick Change-Id: I09778f0795dcb5d87cde652bfb7d514a0dfd9782
docs: add documentation about market multiple apk support

Change-Id: I65815f86890ca51009bdcfa89ab7733bba2881eb

13 years agoMerge "cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e docs: clarify...
Scott Main [Wed, 27 Jul 2011 19:34:24 +0000 (12:34 -0700)]
Merge "cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e docs: clarify that the market app responds to http urls"

13 years agocherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e
Scott Main [Tue, 19 Jul 2011 01:12:44 +0000 (18:12 -0700)]
cherrypick Change-Id: Ib8e73aabb6369a25599aca2351f69cc56333578e
docs: clarify that the market app responds to http urls

Change-Id: Ie9afca5d2e3072bd85c4eb7da1debbf1b5ec02a0

13 years agoMerge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve...
Scott Main [Wed, 27 Jul 2011 19:32:40 +0000 (12:32 -0700)]
Merge "cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e docs: resolve issue 5044273 and fix markup error"

13 years agocherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e
Scott Main [Tue, 19 Jul 2011 18:13:38 +0000 (11:13 -0700)]
cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e
docs: resolve issue 5044273 and fix markup error

Change-Id: Ic028292245c14cca218ea9ac771f292254577e7c

13 years agoMerge "cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e docs: fix...
Scott Main [Wed, 27 Jul 2011 19:26:45 +0000 (12:26 -0700)]
Merge "cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e docs: fix issue 5048214 and clarify some variable names"

13 years agocherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e
Scott Main [Tue, 19 Jul 2011 17:15:39 +0000 (10:15 -0700)]
cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e
docs: fix issue 5048214 and clarify some variable names

Change-Id: Id142fe561690376783e0ec8af23a4f26df785e39

13 years agoMerge "cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b update version...
Scott Main [Wed, 27 Jul 2011 19:24:50 +0000 (12:24 -0700)]
Merge "cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b update version code to 3.2 for docs footer"

13 years agoMerge "Fix issue #4466531: onServiceConnected() not called after..."
Dianne Hackborn [Wed, 27 Jul 2011 19:19:40 +0000 (12:19 -0700)]
Merge "Fix issue #4466531: onServiceConnected() not called after..."

13 years agocherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b
Scott Main [Mon, 18 Jul 2011 19:13:24 +0000 (12:13 -0700)]
cherrypick Change-Id: Ic41d05c61e7b20d9303384c63528f0a79b22310b
update version code to 3.2 for docs footer

Change-Id: Ia62622383fe73c3e62fa9856ef9742327029be5c

13 years agocherrypick Change-Id: I4b79345daeec7087581b459e75f24f0f1b8d7252
Scott Main [Fri, 15 Jul 2011 16:50:49 +0000 (09:50 -0700)]
cherrypick Change-Id: I4b79345daeec7087581b459e75f24f0f1b8d7252
docs: a few edits to support library release notes

Change-Id: I30746a4a92f70ff7a84e7f4c6f9c82b04d6776b8

13 years agocherrypick Change-Id: Id634f16b9498584932e101934fc60648ee469783
Scott Main [Thu, 14 Jul 2011 17:01:42 +0000 (10:01 -0700)]
cherrypick Change-Id: Id634f16b9498584932e101934fc60648ee469783
docs: update support lib doc for r3

Change-Id: I11e7efa89c8c7cc6f96609cf98569387dedf573b

13 years agocherrypick Change-Id: Ibb49b9579902ee2887470e3bcc4f400ac97a51c3
Scott Main [Tue, 12 Jul 2011 23:38:07 +0000 (16:38 -0700)]
cherrypick Change-Id: Ibb49b9579902ee2887470e3bcc4f400ac97a51c3
docs: update homepage for 3.2 and market client

Change-Id: I01144e3fd91298266b66f03987ac6a3fd4a8f0c8

13 years agoChange-Id: I2134948e83bdca3f85c501b5d4f65c1c630f1b85
Scott Main [Thu, 14 Jul 2011 20:55:29 +0000 (13:55 -0700)]
Change-Id: I2134948e83bdca3f85c501b5d4f65c1c630f1b85
docs: revise the supporting screens doc for more clarification

13 years agoMerge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break"
Scott Main [Wed, 27 Jul 2011 18:58:10 +0000 (11:58 -0700)]
Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break"

13 years agoMerge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build"
Scott Main [Wed, 27 Jul 2011 18:58:01 +0000 (11:58 -0700)]
Merge "cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3 fix sdk build"

13 years agocherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0
Scott Main [Thu, 14 Jul 2011 21:01:12 +0000 (14:01 -0700)]
cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0
fix doc break

Change-Id: I8bc19538145e5436128ecbe632d6ecd20ea8ab7a

13 years agocherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3
Scott Main [Thu, 14 Jul 2011 20:56:28 +0000 (13:56 -0700)]
cherrypick Change-Id: I90664a587b358bfebcd4b45d066726973c04fcb3
fix sdk build

Change-Id: I5095cb2413abc08fbf5c8965f3f27bff2a8b2d68

13 years agocherrypick Change-Id: Ib2decf325271c50cac3202bad8c4bbbc40d233f2
Scott Main [Wed, 13 Jul 2011 01:10:00 +0000 (18:10 -0700)]
cherrypick Change-Id: Ib2decf325271c50cac3202bad8c4bbbc40d233f2
docs: add tvdpi info
also resolve issue 5018379 with more info about how size resources are selected

Change-Id: Ib16d4ba81e4ff8ab798bcdfcfc4e086fedac5a1a

13 years agoMerge "cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c docs: add...
Scott Main [Wed, 27 Jul 2011 18:51:16 +0000 (11:51 -0700)]
Merge "cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c docs: add info to plural strings about using string formats"

13 years agoReset input dispatcher targets when focus changes apps.
Jeff Brown [Wed, 27 Jul 2011 18:50:51 +0000 (11:50 -0700)]
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

13 years agocherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c
Scott Main [Thu, 14 Jul 2011 17:24:18 +0000 (10:24 -0700)]
cherrypick Change-Id: I48dad721d5c4d05d6026a886bb5d3b03d2ad036c
docs: add info to plural strings about using string formats

Change-Id: Id02c3ed8215869724092ce143e71142238098358

13 years agoMerge "cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 docs: fix...
Scott Main [Wed, 27 Jul 2011 18:49:22 +0000 (11:49 -0700)]
Merge "cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01 docs: fix shapedrawable doc error issue 5030364"

13 years agocherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01
Scott Main [Thu, 14 Jul 2011 17:10:38 +0000 (10:10 -0700)]
cherrypick Change-Id: Icef6ee0815f927f435318daa61cbe2001c6c9a01
docs: fix shapedrawable doc error
issue 5030364

Change-Id: I5bc56eb659eabd7e5069d1d7b9c4884f387a61ad

13 years agoMerge "cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 docs: add...
Scott Main [Wed, 27 Jul 2011 18:47:48 +0000 (11:47 -0700)]
Merge "cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299 docs: add k-touch driver id"

13 years agocherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299
Scott Main [Wed, 13 Jul 2011 16:36:56 +0000 (09:36 -0700)]
cherrypick Change-Id: Icedeb819abd8c0d07a3bb42ca130135f32066299
docs: add k-touch driver id

Change-Id: I78a36ead667db734a6a4ceb016176a9b1e3bd616

13 years agoMerge "cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 docs: update...
Scott Main [Wed, 27 Jul 2011 18:36:44 +0000 (11:36 -0700)]
Merge "cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299 docs: update Support Mult Screens for MR2 features"

13 years agocherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299
Scott Main [Wed, 22 Jun 2011 21:28:44 +0000 (14:28 -0700)]
cherrypick Change-Id: Ib5e8ae7f420e9084e408089d9f5a6574ad95f299
docs: update Support Mult Screens for MR2 features

Change-Id: Ibab5e60c05c71d58f11daa6f48894011b3e31509

13 years agoMerge "Issue 3370834: No Echo canceler for SIP"
Eric Laurent [Wed, 27 Jul 2011 18:34:36 +0000 (11:34 -0700)]
Merge "Issue 3370834: No Echo canceler for SIP"

13 years agoMerge "Disable Crankshaft in DRT for performance testing."
Guang Zhu [Wed, 27 Jul 2011 18:33:40 +0000 (11:33 -0700)]
Merge "Disable Crankshaft in DRT for performance testing."

13 years agoDO NOT MERGE. may fix build on some version of gcc
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc

Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348

13 years agocherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8
Scott Main [Tue, 12 Jul 2011 22:24:01 +0000 (15:24 -0700)]
cherrypick Change-Id: I4713d3977a0a1514ff9c4217e7f3723c0346d0d8
docs: revise ActionBar class summary and add a few links to dev guide docs

Change-Id: I14df84b16d7bdab85aa74d8b8211e988b0519115

13 years agoUse WebTextView overlay to render text fields/areas much faster
Chris Craik [Mon, 25 Jul 2011 21:35:22 +0000 (14:35 -0700)]
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

13 years agoMerge "Fix USB tethering again"
Mike Lockwood [Wed, 27 Jul 2011 18:05:10 +0000 (11:05 -0700)]
Merge "Fix USB tethering again"

13 years agoFix USB tethering again
Mike Lockwood [Wed, 27 Jul 2011 17:52:32 +0000 (13:52 -0400)]
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>
13 years agoMerge "Make sure that suggestions are queried on focus or tapping."
Amith Yamasani [Wed, 27 Jul 2011 17:54:15 +0000 (10:54 -0700)]
Merge "Make sure that suggestions are queried on focus or tapping."

13 years agoMerge "Handle callbacks to CollapsibleActionViews that are in an actionLayout."
Amith Yamasani [Wed, 27 Jul 2011 17:53:25 +0000 (10:53 -0700)]
Merge "Handle callbacks to CollapsibleActionViews that are in an actionLayout."

13 years agoReconcile with gingerbread-mr4-release
The Android Open Source Project [Wed, 27 Jul 2011 17:42:40 +0000 (10:42 -0700)]
Reconcile with gingerbread-mr4-release

Change-Id: Ib13d4ae0889290a35357da01bf3acf140b89bd23

13 years agoMerge "Cherry pick from Honeycomb-mr2 Change ID I6ba2dca8606cdd4608d42f219b115536fac...
Bill Gruber [Wed, 27 Jul 2011 17:29:57 +0000 (10:29 -0700)]
Merge "Cherry pick from Honeycomb-mr2 Change ID  I6ba2dca8606cdd4608d42f219b115536facf099f IAB docs: fixes and updates"

13 years agoMerge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f...
Bill Gruber [Wed, 27 Jul 2011 17:29:47 +0000 (10:29 -0700)]
Merge "Cherry pick from Honeycomb-mr2 Change ID Id87a6000de458a1d3e4ac11aaf64355a244f2f07 sdk doc change: updated intro to developing and removed reference to G1 Bug: 4483863"

13 years agoMerge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51"
Robert Ly [Wed, 27 Jul 2011 17:27:59 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51"

13 years agoMerge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4"
Robert Ly [Wed, 27 Jul 2011 17:27:53 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4"

13 years agoMerge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b"
Robert Ly [Wed, 27 Jul 2011 17:27:46 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b"

13 years agoMerge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989"
Robert Ly [Wed, 27 Jul 2011 17:27:39 +0000 (10:27 -0700)]
Merge "cherrypick from hc-mr2 Change-Id: I1f8d5d01c7f526c6ac47a1e1e5f3e43bff196989"