68240 Commits

Author SHA1 Message Date
The Android Open Source Project
77252c664c am f815dc4e: am 64a907c5: Reconcile with ics-mr1-release
* commit 'f815dc4e4a09ec53f183a391495ef87dd21ccc6f':
2012-02-23 11:20:30 -08:00
The Android Open Source Project
9d3864c942 am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release
* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':
2012-02-23 11:20:16 -08:00
The Android Open Source Project
4c569c5f89 am 5cfee77e: am 8013fd39: Reconcile with ics-mr1-release
* commit '5cfee77e400a6e1f51b37e03ce090bc233f1bb8a':
2012-02-23 11:19:58 -08:00
Dianne Hackborn
a2514f3a95 am 536a3b18: am f08beab2: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded
* commit '536a3b185bb0a2f7bc11b78e00123ee502c99f2f':
2012-02-23 11:19:50 -08:00
Adam Powell
29382d9d9d Bug 6058721 - optimize changing checked states in AbsListView
Instead of treating a checked state change as a full data set change,
simply modify the checked or activated state of on-screen views.
Any resulting layout changes will be serviced as appropriate.

Change-Id: Ia846de16bbc54f0729608259aa4b530da9404245
2012-02-23 11:04:38 -08:00
James Dong
365ce1db33 Improved comment about DrmStore.ConstraintsColumns
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
2012-02-23 10:58:55 -08:00
Dianne Hackborn
b8678d76c3 resolved conflicts for merge of 210c1a26 to master
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
2012-02-23 10:54:06 -08:00
The Android Automerger
b585b9f400 merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:45:15 -08:00
Dianne Hackborn
c42067d7d7 Merge "Fix issue #6049410: 3rd party app crashing in JB: Uber" 2012-02-23 10:45:11 -08:00
John Reck
4d0a8cf067 Support mIntentUrl for addresses
Change-Id: I61abf7f333608fa91629ce62e348dda83a795e45
2012-02-23 10:28:53 -08:00
George Mount
53519eacac Add javascript key events for special characters.
Bug 6033096

Change-Id: I6c10db405266eee3e25f7446a43f4d7a566f3ef7
2012-02-23 10:27:53 -08:00
Dianne Hackborn
81873e95de Fix issue #6049410: 3rd party app crashing in JB: Uber
Change-Id: Ie3f8c91a2c0fdd5a80824fe2fa7da2afd2913174
2012-02-23 10:25:35 -08:00
Alex Sakhartchouk
3c8eed3bdc Adding a few more howto elements to scenegraph example.
Change-Id: I29f025ce6ecf3a8090a8365991de40af72b4e78f
2012-02-23 10:12:45 -08:00
Stephen Hines
a16c98c155 Merge "Support running ForEach on non-root functions." 2012-02-23 09:58:56 -08:00
Gilles Debunne
a172b6e969 Merge "Updated min/maxLines and singleLine documentation" 2012-02-23 09:26:25 -08:00
Andreas Huber
05e8074eaa Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass" 2012-02-23 09:13:45 -08:00
Jean-Baptiste Queru
812c623563 am ad3102d0: am f3d94b44: am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed."
* commit 'ad3102d06bc6060f739e0803d0e45dec8020703b':
  Call onTimeChanged when AM/PM changed.
2012-02-23 08:35:03 -08:00
Tsu Chiang Chuang
453057a9d5 am 7b306ae2: am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '7b306ae225b0a7337972f4d8bff51e8f79be3a03':
2012-02-23 08:34:56 -08:00
Tsu Chiang Chuang
541710a9ae am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit 'c16d9de72996950ec7f55af80d2864cd2abad1c2':
  fix NPE in race condition.
2012-02-23 08:34:44 -08:00
Michael Jurka
08cb8352ef am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'a7e1d8d5f7d16cd1004189f9aee727962790b8bf':
2012-02-23 08:11:45 -08:00
Michael Jurka
6ad5d69da5 am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '0a232673370989f54e05fd2508ce90267a54abd1':
  Don't allow screen invalidations to go outside bounds of screen
2012-02-23 08:09:59 -08:00
Michael Jurka
a7e1d8d5f7 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
2012-02-23 08:07:51 -08:00
Michael Jurka
0a23267337 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
2012-02-23 08:07:22 -08:00
Adam Powell
a4b8a2e4d1 am 49913d8c: am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit '49913d8c60a2add8989435bcda532959e86f99b1':
2012-02-23 07:30:09 -08:00
Adam Powell
1f0f9d28a1 am c0d0dddc: am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks
* commit 'c0d0dddc20827846dcf3235f7307ad76d2893ba6':
  Bug 6021294 - Contextual action bar animation tweaks
2012-02-23 07:30:01 -08:00
Jean-Baptiste Queru
68e696b137 am 058bd2ec: am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails"
* commit '058bd2ecbcf8057511b00685eddc4ff5061bdbc1':
  Return error code when composing PDU fails
2012-02-23 07:29:46 -08:00
Jean-Baptiste Queru
d7170f3262 am 4b3ec09b: am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS"
* commit '4b3ec09b8199d3c70fbb025a73e8f0a46dcd22c9':
  Add support for bmp and wav content types in MMS
2012-02-23 07:29:42 -08:00
The Android Open Source Project
bd06f16077 am e3804813: am f5f5d61c: Reconcile with ics-mr1-release
* commit 'e380481381b8679bf4bd4afb922e82e0a849b2bb':
2012-02-23 07:29:21 -08:00
Jean-Baptiste Queru
00ef7e8f2f am 50ff08a2: am 8a33803d: am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons"
* commit '50ff08a24e7a94c196f9b5c0b5b9ebdc03064a36':
  Increase PDU parts buffer size for performance reasons
2012-02-23 07:29:15 -08:00
The Android Open Source Project
12c5502612 am a4ea7a8f: am c30fdda0: Reconcile with ics-mr1-release
* commit 'a4ea7a8f204890aee9a50d2e65b410bb443b7149':
2012-02-23 07:29:06 -08:00
Marc Blank
0d1490bd3b am cedcdc98: (-s ours) am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit 'cedcdc984cf36d3b3aeca359b4866e5680427c51':
2012-02-23 07:28:54 -08:00
Marc Blank
9b99df6ce6 am cdbf0efc: (-s ours) am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit 'cdbf0efcdc42ea0ef7290c4d73da16f596c8e8be':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
2012-02-23 07:28:51 -08:00
Steve Block
2eb7309388 Merge "Drop support for Android HTTP stack" 2012-02-23 04:29:30 -08:00
Michael Jurka
bf378fd7d7 Don't allow screen invalidations to go outside bounds of screen
Fixes invalidation issue in Launcher

Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
2012-02-23 00:19:58 -08:00
Insun Kang
0de4783ae0 Changed TimedTextInBandSource to TimedText3GPPSource.
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
2012-02-23 15:13:24 +09:00
Daniel Lam
a631399f71 Removed dependecies between BufferQueue and SurfaceTexture
Refactored SurfaceTexture and BufferQueue such that share
no protected members.  Created an consumer facing interface
for BufferQueue in preparation of connecting SurfaceTexture
and BufferQueue through a binder.

Change-Id: Iff55e740e36a7f70c9f7a17ee7a5af38e3d21f0f
2012-02-22 20:12:27 -08:00
Gilles Debunne
0b5a6b2e8a Merge "Fixed comment for selectAllOnFocus" 2012-02-22 18:27:27 -08:00
Gilles Debunne
e58b7f45ec Fixed comment for selectAllOnFocus
Pre-focusable in touch mode ? cursor moves to tapped position.
or previous position when using d-pad/keyboard.

Change-Id: Iac725ff233bfeac2dc14e870118047a9a8418ff9
2012-02-22 18:26:04 -08:00
Gilles Debunne
e35a07050d Updated min/maxLines and singleLine documentation
Bug http://code.google.com/p/android/issues/detail?id=24891

Change-Id: I0b35d2e0583f285f38e14e43563433433a8984d1
2012-02-22 18:24:17 -08:00
George Mount
ebb8e95657 Merge "Characters sent directly to InputConnection treated as changes." 2012-02-22 17:33:03 -08:00
George Mount
6420ec4cd5 Characters sent directly to InputConnection treated as changes.
Bug 6045123

Change-Id: Iab8c1e3c307ec84c4f6934abfa2d0cea726d9efe
2012-02-22 17:23:23 -08:00
Svetoslav Ganov
2822111948 Merge "Add check for no children in VIew hosting virtual view tree." 2012-02-22 16:49:36 -08:00
Svetoslav Ganov
311a63af40 Add check for no children in VIew hosting virtual view tree.
1. For accessibility purposes View may report a virtual tree
   rooted at them to convey the logical structure they draw.
   These are usually custom Views. Such views cannot have
   children and this patch adds a check for that.

bug:6022217

Change-Id: I3795a613b4aef1a7ec5810db8584a11b648870f2
2012-02-22 16:45:10 -08:00
Scott Main
8857f669f9 am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '2a24914caf7dd2906b0af3b82c40db5917b6e545':
2012-02-22 16:27:16 -08:00
Scott Main
cb4ebcb20b am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit 'ce980d8ea0c4747ee23b05dfcc7c02655f595fde':
  docs: fix broken link
2012-02-22 16:25:49 -08:00
Scott Main
ce980d8ea0 am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
2012-02-22 16:23:04 -08:00
Scott Main
2a24914caf am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
2012-02-22 16:23:03 -08:00
Andreas Huber
5c850396b3 Add new APIs AMessage::(set|find)Buffer to make it safer to pass
ABuffer objects through messages.

Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
2012-02-22 16:20:59 -08:00
Scott Main
68d97aa2c1 Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
George Mount
49cc3d98e2 Merge "Changes that don't map to keys sent as text changes." 2012-02-22 16:02:30 -08:00