Xavier Ducrohet
4b52ec49fe
LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
...
frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647
Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
2011-02-23 19:47:02 -08:00
Wink Saville
0dc8618dc7
Do not start RILReceiver if wifi-only.
...
By not starting RILReceiver we don't waste any cycles
trying to communicate with a vendor ril which may
not exist. This allows a wifi-only device to operate
as expected and the system to gracefully handle the
missing radio as ril requests will report RADIO_NOT_AVAILABLE.
Change-Id: I6c6f60830486c5f0447b3b9eb44c8b1f2d70c517
2011-02-23 18:11:45 -08:00
Jason Chen
36b0b85abd
am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:08:23 -08:00
Jason Chen
22577b8d3a
am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
...
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:03:34 -08:00
Irfan Sheriff
6588c7cf73
am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
...
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
DO NOT MERGE Add support for background scanning
2011-02-23 18:02:45 -08:00
Jason Chen
5ff79c3b06
Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f
DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
...
Original change description follows:
-----------------------------------
Implement issue #3326435 : Battery stats improvements
Keep track of discharge while screen is on vs. off.
Checkin looks like:
5,0,u,dc,1,1,1,0
The last four numbers are, from left:
- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.
Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
2011-02-23 17:21:09 -08:00
Irfan Sheriff
5107eea64e
Merge "DO NOT MERGE Add support for background scanning" into honeycomb
2011-02-23 16:59:55 -08:00
Scott Main
b1eea45a71
am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
...
* commit '201959af6e61c148576c77de6cf772456d664251':
docs: fix sensorevent code snippets bug: 3480932
2011-02-23 16:00:08 -08:00
Scott Main
201959af6e
Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
2011-02-23 15:58:13 -08:00
Eric Fischer
bb0c1a366d
am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
Import revised translations. DO NOT MERGE
2011-02-23 15:36:08 -08:00
Eric Fischer
32751e3175
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-23 15:33:12 -08:00
Eric Fischer
fc1c800b2e
Import revised translations. DO NOT MERGE
...
Change-Id: I5089e17bd14de7b4e217c1b91e393ae4799c4263
2011-02-23 14:49:04 -08:00
Irfan Sheriff
b0e5326d8c
am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
...
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:38:10 -08:00
Irfan Sheriff
a46a5cba27
Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
2011-02-23 14:35:20 -08:00
Scott Main
63a4f9f5e6
am c516c771: docs: fix md5 sums
...
* commit 'c516c7714d9cdc996053fd2a130015cbde978242':
docs: fix md5 sums
2011-02-23 14:17:30 -08:00
Scott Main
c516c7714d
docs: fix md5 sums
...
Change-Id: Ie1cb77cf54bd17d2aa8228f73158e7589a7aebaa
2011-02-23 14:13:50 -08:00
Alon Albert
9add122296
DO NOT MERGE - Increasing timeout to 60 sec
...
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.
Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d
DO NOT MERGE No backup of country and sleep policy
...
Remove country code and sleep policy setting back up as it
is a device specific setting
Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
2011-02-23 13:51:52 -08:00
Jamie Gennis
20bfbd9544
am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
...
* commit '76d0c763f008d19791e13ebabe9ec83958354bc5':
egl: fixes for object refcounts
2011-02-23 13:31:12 -08:00
Jamie Gennis
76d0c763f0
am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread
...
* commit 'fa238f033203f8e722b060af3f0095762b134f37':
egl: fixes for object refcounts
2011-02-23 12:46:57 -08:00
Jamie Gennis
fa238f0332
Merge "egl: fixes for object refcounts" into gingerbread
2011-02-23 12:30:55 -08:00
Scott Main
02be2f1d87
am 2788e4f9: docs: fix some typos
...
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
docs: fix some typos
2011-02-23 11:24:42 -08:00
Scott Main
d11ee90b6e
docs: fix sensorevent code snippets
...
bug: 3480932
Change-Id: Id97ca4e0edfb92eaac0f2996bc5e91d757644afb
2011-02-23 10:57:23 -08:00
Scott Main
2788e4f96a
docs: fix some typos
...
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
2011-02-23 10:54:31 -08:00
Irfan Sheriff
74ff3d23f9
DO NOT MERGE Add support for background scanning
...
Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan
Bug: 3453021
Change-Id: I73dcf4e1c9ab4de280c40b6df6147a74ac003123
2011-02-23 10:49:36 -08:00
Justin Ho
57b920bd61
am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets
...
* commit 'da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
Updated iconography for network status and adding 4G assets
2011-02-22 21:23:54 -08:00
Alon Albert
a0946d6399
am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
...
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
Support quoted parameters
2011-02-22 21:23:50 -08:00
Justin Ho
da34ab2148
am 9208875e: Updated iconography for network status and adding 4G assets
...
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
Updated iconography for network status and adding 4G assets
2011-02-22 21:19:05 -08:00
Alon Albert
1aba843dc3
am ccc802e1: Merge "Support quoted parameters" into gingerbread
...
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
Support quoted parameters
2011-02-22 21:18:52 -08:00
Robert Ly
190d4e29f9
am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
...
* commit 'c6c6fe939c83e644b7626f6d3f3be25883af1583':
doc change: fix missing code ending tag
2011-02-22 21:15:28 -08:00
Scott Main
d316bffeca
am 47928f89: Merge "docs: fix broken links" into honeycomb
...
* commit '47928f898d81625cb1e66eea9eb6120f719e89ee':
docs: fix broken links
2011-02-22 21:15:23 -08:00
James Dong
d97c598ff4
am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
...
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:15:19 -08:00
Scott Main
1943b8c8da
am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
...
* commit '0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
docs: update highlights doc to remove preview
2011-02-22 21:15:15 -08:00
Scott Main
8bee412546
am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
...
* commit '9d5f35d9e0e406bd9e109879db890e361e137929':
docs: add breadcrumb trails to some docs, mostly manifest docs
2011-02-22 21:15:09 -08:00
Roman Nurik
306115b617
am cba8efdf: Add more tags to the RenderScript sample listing.
...
* commit 'cba8efdff8a77b159f259d973b05d508a61206e1':
Add more tags to the RenderScript sample listing.
2011-02-22 21:15:03 -08:00
Dirk Dougherty
30eefe6381
am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
...
* commit '7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
2011-02-22 21:14:58 -08:00
Roman Nurik
c49992c91c
am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
...
* commit '4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
Document support for WebM/VP8 decoding.
2011-02-22 21:14:52 -08:00
Nick Pelly
4c9647cf4c
am beb01c93: Merge "DO NOT MERGE." into honeycomb
...
* commit 'beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
DO NOT MERGE.
2011-02-22 21:14:46 -08:00
Scott Main
976a3b4a96
am 4d62ef25: docs: revert ndk r6
...
* commit '4d62ef259568a050e0103a9beff702f0edd03f61':
docs: revert ndk r6
2011-02-22 21:14:40 -08:00
Scott Main
d80d6c52ee
am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded
...
* commit 'f870c5af7ac45d1c865bb2de5696f45c24ac396d':
docs: add new-child tags to hide the "new" tag when a parent list item is expanded
2011-02-22 21:14:34 -08:00
Scott Main
bf1f25d888
am 1f694390: docs: move 3.0 optimizing doc into the dev guide
...
* commit '1f694390225b462f76d580fb150fb0a07585df48':
docs: move 3.0 optimizing doc into the dev guide
2011-02-22 21:14:15 -08:00
Michael I. Gold
c0775a2567
egl: fixes for object refcounts
...
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-02-22 18:15:08 -08:00
Robert Ly
c6c6fe939c
Merge "doc change: fix missing code ending tag" into honeycomb
2011-02-22 16:57:06 -08:00
Scott Main
47928f898d
Merge "docs: fix broken links" into honeycomb
2011-02-22 16:49:32 -08:00
James Dong
6c9b500fc5
Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
2011-02-22 16:41:29 -08:00
Robert Ly
1fdabeb832
doc change: fix missing code ending tag
...
Change-Id: I64f658d8f843343daa24d81548fd0a3148c8982e
2011-02-22 16:36:49 -08:00
Scott Main
752a1b9e7e
docs: fix broken links
...
Change-Id: I2dd9f1d00ac84217b4af8fee73cabeaed7481cf2
2011-02-22 16:36:02 -08:00
Justin Ho
9208875e92
Updated iconography for network status and adding 4G assets
...
Change-Id: Ie8dc203587836d88ded2846329db1a0c1667afcc
2011-02-22 16:12:46 -08:00
Scott Main
0ea4f0d791
Merge "docs: update highlights doc to remove preview" into honeycomb
2011-02-22 15:36:31 -08:00