Siva Velusamy
3d8f4ebb06
Merge "gltrace: fixup Push & Insert Marker calls"
2012-02-01 13:08:58 -08:00
Siva Velusamy
a7167f3647
gltrace: fixup Push & Insert Marker calls
...
Change-Id: I58ced7225fac79ec636a65da4883614a5dce6dff
2012-02-01 12:16:40 -08:00
Scott Main
0aa4ea54f6
am d3747509: am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
...
* commit 'd3747509f5d3c64f1fbc6255a6f7f20aac023ead':
docs: fix action bar style example
2012-02-01 12:01:32 -08:00
Scott Main
a10be9c171
am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
...
* commit '8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
docs: fix action bar style example
2012-02-01 11:58:57 -08:00
Scott Main
1ba2367924
am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
...
* commit '6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
2012-02-01 11:56:23 -08:00
Scott Main
fa8e018073
Merge "docs: fix action bar style example" into ics-mr1
2012-02-01 11:54:57 -08:00
Scott Main
4bf9508f87
am 0683d096: am b43a0f1f: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
...
* commit '0683d0963b95f7c19318e7bfc74fc887332057e4':
docs: dashboard update for feb 1
2012-02-01 11:51:56 -08:00
Scott Main
8a9aaaf95a
am 414cc6cf: am 9af875ec: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
...
* commit '414cc6cfcdb6d766d095f0af1da76e7da946af84':
docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 11:51:53 -08:00
Scott Main
f492438d64
am b43a0f1f: am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
...
* commit 'b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
docs: dashboard update for feb 1
2012-02-01 11:48:28 -08:00
Scott Main
cae4d0cdbc
am 9af875ec: am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
...
* commit '9af875ec74e34541539897d7a8069b4ea7f07b12':
docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 11:48:26 -08:00
Scott Main
f61e776f87
am f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
...
* commit 'f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
2012-02-01 11:45:51 -08:00
Scott Main
13393bdca5
am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
...
* commit '5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
2012-02-01 11:45:49 -08:00
Scott Main
d6d4b9aa2f
Merge "docs: dashboard update for feb 1" into ics-mr1
2012-02-01 11:43:48 -08:00
Andreas Huber
41a74c4222
Merge "The software AMR NB encoder is now an OMX component."
2012-02-01 11:31:13 -08:00
Xia Wang
2d0e38ecae
Merge "Use PackageManager to detect wifi-only devices in ConnectivityManagerTest."
2012-02-01 11:12:05 -08:00
Xia Wang
e96b94f3e1
am 606b16bc: am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
...
* commit '606b16bc160e66709408b3e49e273efcff0a148d':
Fix a typo in image processing test
2012-02-01 10:59:44 -08:00
Xia Wang
36b0ce8789
am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
...
* commit 'e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
Fix a typo in image processing test
2012-02-01 10:57:07 -08:00
Xia Wang
365b1d50c0
am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
...
* commit 'ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
2012-02-01 10:54:30 -08:00
Xia Wang
6bd64dd226
Merge "Fix a typo in image processing test" into ics-mr1
2012-02-01 10:51:43 -08:00
Makoto Onuki
ccea1603e8
Merge "Fix 3 broken unittests."
2012-02-01 10:44:10 -08:00
Dianne Hackborn
856b56877d
Merge "Update preload drawables to not include pre-holo assets."
2012-02-01 10:26:51 -08:00
The Android Open Source Project
2680b68cfc
am 964faa35: am 3f3afbef: Reconcile with ics-mr1-release
...
* commit '964faa351815a86cf6832f261e71daf48af3d5c6':
2012-02-01 10:06:19 -08:00
The Android Open Source Project
4b38af44a9
am 3f3afbef: Reconcile with ics-mr1-release
...
* commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':
2012-02-01 10:01:22 -08:00
The Android Open Source Project
ea5af69402
am 5ec5c752: Reconcile with ics-mr1-release
...
* commit '5ec5c7525d3144c306ad245dd10d893ecdf654fa':
Use LTE SNR and RSRP to set signal level bar.
2012-02-01 09:48:36 -08:00
The Android Open Source Project
e8308aa156
Reconcile with ics-mr1-release
...
Change-Id: I79900da9bc339bad1350124768b53026f465a345
2012-02-01 08:49:50 -08:00
The Android Open Source Project
322e2109e3
Reconcile with ics-mr1-release
...
Change-Id: Ia38fac8a91adbce6ae5c796c86252ac2364e3a6f
2012-02-01 08:42:59 -08:00
Scott Main
149d0d4c6f
am 1a8a8b73: am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag c
...
* commit '1a8a8b73d48261384a0f63df894b68db97e7b02c':
docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
2012-02-01 00:18:11 -08:00
Xavier Ducrohet
da2956ba8b
Merge "Add tools specific annotations to the API."
2012-01-31 17:44:14 -08:00
James Dong
7ff4de4a84
Merge "add tests module tag to omx_tests"
2012-01-31 17:36:37 -08:00
Jeff Sharkey
a2e994347e
Merge "Clear identity when updating network stats."
2012-01-31 17:14:14 -08:00
Mathias Agopian
baf1c68c74
Merge "fix an issue with vsync event delivery"
2012-01-31 16:46:27 -08:00
Mathias Agopian
3cf199aef6
fix an issue with vsync event delivery
...
vsync events were sometimes delivered to connected
client who didn't request them. this happened if
another client requested the delivery and that client
was first in the client list.
also fix the vsync test which didn't request any events as
well as DisplayEventReveiver documentation which was misleading
about the necessity to request vsync events.
Change-Id: Ie990fda3f337f8f0042745c4b2cde67936c45686
2012-01-31 16:42:54 -08:00
Scott Main
44959ef30f
am 0b2701b7: Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a form
...
* commit '0b2701b7344fb7b7b6f9a1c1c99c8ede81b49d2d':
docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug.
2012-01-31 16:10:38 -08:00
Scott Main
e9a01c3838
Merge "docs: change that stated as a few doc fixes and turned into fully documenting the device default themes and fixing many more, including adding API level information for older themes to avoid confusion. Oh and fix an unclosed <em> tag causing a format bug." into ics-mr1
2012-01-31 16:08:09 -08:00
Mathias Agopian
7fc1fc1bd0
Merge "Nexus S now reports the proper frame-rate"
2012-01-31 15:54:20 -08:00
The Android Automerger
91741bc2e6
merge in ics-mr1-release history after reset to ics-mr1
2012-01-31 15:42:17 -08:00
Dianne Hackborn
60b133efc3
aapt now sorts the strings in the resource string pool.
...
In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).
Also add a new aapt command to print the contents of the resource
table string pool.
Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
2012-01-31 15:41:30 -08:00
Stephen Hines
3fce36f892
Merge "Test RS struct writing/reading."
2012-01-31 15:32:39 -08:00
Jeff Sharkey
69b33329e5
Merge "Dump xt_qtaguid stats to using GID instead of su."
2012-01-31 14:50:30 -08:00
Justin Ho
8a0235cf04
am 66146c4f: am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
...
* commit '66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d':
Use LTE SNR and RSRP to set signal level bar.
2012-01-31 14:05:26 -08:00
Justin Ho
c9a53618ef
am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
...
* commit '792d83c5087a7a6dec4e64f59f5b78d1041c9585':
Use LTE SNR and RSRP to set signal level bar.
2012-01-31 14:02:44 -08:00
Justin Ho
675fe24179
Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1
2012-01-31 14:00:55 -08:00
John Reck
645680f80b
Merge "Support select all"
2012-01-31 13:41:59 -08:00
Romain Guy
4fb3e778ed
Merge "Add GradientDrawable.setColors(int[])"
2012-01-31 12:12:38 -08:00
James Dong
f2a86c4f94
Merge "First step of refactoring 'timedtext' code."
2012-01-31 12:06:43 -08:00
Andreas Huber
b12307020c
Merge "Slighly improve the API to discover if the OMX stack is running in the local"
2012-01-31 11:27:06 -08:00
John Reck
84bdbe259b
Merge "Webkit text selection"
2012-01-31 11:08:14 -08:00
Chet Haase
e3eefbf1f9
Merge "Add new ViewPropertyAnimator utility methods"
2012-01-31 11:07:25 -08:00
Romain Guy
a459332a5b
Merge "Proper equals/hashCode impls in Rect and RectF"
2012-01-31 10:51:38 -08:00
Jeff Brown
d713bd00b8
Merge "Use O_CLOEXEC when opening input device."
2012-01-31 10:05:51 -08:00