James Dong
ca88e35764
Fix memory leakage due to unreleased MuxOMX objects after disconnection
...
o related-to-bug: 5984232
Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
2012-02-23 14:04:20 -08:00
Romain Guy
1ea55cf3c7
Merge "Perform early intersect to avoid unnecessary draws"
2012-02-23 13:53:47 -08:00
Romain Guy
cfef12374c
Perform early intersect to avoid unnecessary draws
...
Change-Id: I48d61c4488e622f93733d8e53a50c93e6a20166d
2012-02-23 13:50:37 -08:00
John Reck
1aa939759c
Merge "Support mIntentUrl for addresses"
2012-02-23 13:40:25 -08:00
Eric Fischer
b442eca2b1
Merge "Import translations. DO NOT MERGE"
2012-02-23 13:17:10 -08:00
Eric Fischer
6c89da2963
Import translations. DO NOT MERGE
...
Change-Id: I49ba9b62c775d42d0f785a54d7c575bd93380a85
2012-02-23 13:14:21 -08:00
Jean-Baptiste Queru
111a7a107c
am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 13:04:24 -08:00
Jean-Baptiste Queru
0842a2262d
am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 13:01:59 -08:00
Jean-Baptiste Queru
fe99051c78
am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29
am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
2012-02-23 12:38:14 -08:00
Michael Jurka
61fd70a34f
am 08cb8352: am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
...
* commit '08cb8352ef208730e4e3e1e71ebc47a59f0363de':
2012-02-23 12:26:18 -08:00
Michael Jurka
b7ee8e2cb4
am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
...
* commit '6ad5d69da5cff2e4b5fb7acdb2699e2315b83307':
Don't allow screen invalidations to go outside bounds of screen
2012-02-23 12:26:16 -08:00
Scott Main
6bf8742ff9
am 8857f669: am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit '8857f669f902acd5f3763ea65b023a0987e6ea0e':
2012-02-23 12:26:01 -08:00
Scott Main
3fcf93b037
am cb4ebcb2: am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit 'cb4ebcb20b8540cc8027ae03dd578ce3846e9af1':
docs: fix broken link
2012-02-23 12:25:53 -08:00
Xavier Ducrohet
68466c5220
am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '3c84c30a8605b56d63847081eaba79562dc1fa83':
2012-02-23 12:25:46 -08:00
Jean-Baptiste Queru
9f0094d7df
am 9379ac38: (-s ours) am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
...
* commit '9379ac3878f8ef104eb540566048d56577004190':
Add stubs for improved compatibility
2012-02-23 12:25:44 -08:00
Xavier Ducrohet
5e6c219477
am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
Make sure resource references are resolved.
2012-02-23 12:22:40 -08:00
Jean-Baptiste Queru
6822c97898
am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
...
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
Xcode 4.3 compatibility checkin
2012-02-23 12:22:35 -08:00
Jean-Baptiste Queru
afb902be67
am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"
...
* commit '9f207a850f6c5744db895692f21159d9a88966c5':
The bigger touch slop still has a problem
2012-02-23 12:22:29 -08:00
Andreas Huber
b07ae06e75
Merge "Be more greedy when it comes to gathering input and output buffers."
2012-02-23 11:54:08 -08:00
Adam Powell
6723dd9561
Merge "Bug 6058721 - optimize changing checked states in AbsListView"
2012-02-23 11:49:05 -08:00
Andreas Huber
a2798e252a
Be more greedy when it comes to gathering input and output buffers.
...
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
2012-02-23 11:21:43 -08:00
Rich Hyndman
d2b44e0706
am 46074f4d: am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
...
* commit '46074f4d4aa8334249a9bd71e6d0bc25066d5cae':
2012-02-23 11:20:43 -08:00
Rich Hyndman
0b2a139142
am f2381328: am 22c98df9: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
...
* commit 'f238132853d2482979ec98a9d4f81ea24273768d':
docs: Added Lint into Android Training and removed Layoutopt.
2012-02-23 11:20:40 -08:00
The Android Open Source Project
1e5a331be6
am d4c617ae: am 41cea4b5: Reconcile with ics-mr1-release
...
* commit 'd4c617aed18ba4080c773ff40a2b0f75b4a73645':
2012-02-23 11:20:36 -08:00
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
Dianne Hackborn
b8678d76c3
resolved conflicts for merge of 210c1a26 to master
...
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
2012-02-23 10:54:06 -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