Teng-Hui Zhu
da7378e86e
Adding a debug setting to enable visual indicator for GL
...
[This is the WebView part]
The idea is to turn on the visual indicator without building the code.
The implementation included:
1. Setup the UI on browser side to check whether or not this is enabled.
2. Transfer the info from browser setting to web setting.
3. Send this info down from WebView to webkit.
4. In the webkit, we save this info in TilesManager.
5. At texture generation time, we query this info to decide whether or
not add the visual indicator on the texture.
One design decision we made is we don't want to restart the browser for
debugging purpose. This is better preserving the browser current activity,
the only pitfall is that the visual indicator is NOT updated on different
textures simultaneously.
The corresponding browser change is: #change,97058
The dependent webkit change is: #change,97052
bug:3458721
Change-Id: I34a0514048df61b414c3386b292f2586efbde74e
2011-02-16 14:35:28 -08:00
Andreas Huber
6c0dc5a5c1
am 09b18c2f: (-s ours) am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
...
* commit '09b18c2f1d5ca6cf25352ae633f2121556a516ab':
DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:31:27 -08:00
Basavapatna Dattaguru
9cfeb6ecfa
VideoEditor:Issue ID: 3431967
...
Fixes memory leak in getProperties
Updated with Review comments
Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
2011-02-16 14:29:02 -08:00
Irfan Sheriff
652bc96444
Make high performance wifi lock public
...
gtalk and sip already use the high perf lock. Improve
the comments and make the constant public.
This will allow applications that use voice or video
to keep the connection good even when device screen
is off
Change-Id: I3608cd478175c773bd835b26a686a61b8baf5471
2011-02-16 14:28:45 -08:00
Andreas Huber
09b18c2f1d
am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
...
* commit '79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:28:01 -08:00
Andreas Huber
79a9748949
am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
...
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:24:53 -08:00
Adam Cohen
1ff65d105a
StackView rendering fix for non-hardware accelerated apps and hardware layers
...
Change-Id: I34a0362cd37c6b95a0b3196302b6510b0f7ad34e
2011-02-16 14:04:09 -08:00
Andreas Huber
dbe09da6ac
DO NOT MERGE: Respond to RTSP server->client requests.
...
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
2011-02-16 13:37:19 -08:00
Andreas Huber
9464f9c5a4
Merge "Respond to RTSP server->client requests."
2011-02-16 13:27:02 -08:00
Andreas Huber
e0666163ab
Respond to RTSP server->client requests.
...
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a
related-to-bug: 3353752
2011-02-16 13:21:35 -08:00
Irfan Sheriff
0432ab44f3
Merge "Fix wifi watchdog to use InetAddress"
2011-02-16 13:17:54 -08:00
Dmitri Plotnikov
06f992c6b0
Merge "Setting copiedSize to 0 when value is null"
2011-02-16 13:15:15 -08:00
Brian Carlstrom
7343bb5f1d
Merge "Deprecate non-X509Certificate SslCertificate constructors"
2011-02-16 12:56:36 -08:00
Shimeng (Simon) Wang
44c3109055
Merge "Remember zoom overview state since the postscale callback is async."
2011-02-16 12:55:47 -08:00
Brian Carlstrom
cc687c52a0
Deprecate non-X509Certificate SslCertificate constructors
...
Change-Id: I45541c48b321fbd6054712c08d8ac64108d32674
2011-02-16 12:50:56 -08:00
Scott Main
4622af0075
am 869f1f3e: am 0643d7c4: docs: add new tag for tasks doc
...
* commit '869f1f3e9024d66c57bc30d3afb821074a9139f7':
docs: add new tag for tasks doc
2011-02-16 12:45:34 -08:00
Mike Lockwood
984dd8a206
Merge "UsbManager: New APIs for USB accessories"
2011-02-16 12:42:35 -08:00
Scott Main
869f1f3e90
am 0643d7c4: docs: add new tag for tasks doc
...
* commit '0643d7c442f975efa35c9e3729d74555627a32b5':
docs: add new tag for tasks doc
2011-02-16 12:41:53 -08:00
Scott Main
0643d7c442
docs: add new tag for tasks doc
...
Change-Id: I60248fb9ec1d98e89b526391c453d1bde9226cb0
2011-02-16 12:38:59 -08:00
Kenny Root
ca20af0c29
Merge "Clean up use of HAVE_ANDROID_OS"
2011-02-16 12:33:28 -08:00
James Dong
8ec313e4fa
Merge "Change the media player stress test to repor the total number of failure and the total number of info. Register the surface callback in the test application bug# 2909064"
2011-02-16 12:27:08 -08:00
Yu Shan Emily Lau
85305f04d5
Change the media player stress test to repor the total number of failure and the total number of info.
...
Register the surface callback in the test application bug# 2909064
Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
2011-02-16 12:24:34 -08:00
Andy Stadler
b84133740a
am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
...
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
@hide DPM global proxy settings
2011-02-16 12:22:57 -08:00
Andy Stadler
04ddff6905
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
...
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
2011-02-16 12:20:36 -08:00
Andy Stadler
b183508516
Merge "@hide DPM global proxy settings" into honeycomb
2011-02-16 12:18:39 -08:00
Scott Main
d5444802b7
am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
...
* commit '153cebee2432a931773130bffa20e72a982c0107':
docs: update homepage for 3.0 announcement
2011-02-16 12:11:11 -08:00
Scott Main
153cebee24
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
...
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
2011-02-16 12:08:36 -08:00
Dmitri Plotnikov
9480efeff7
Setting copiedSize to 0 when value is null
...
Bug: 3457998
Change-Id: I01f6d02e76884639600c679518c5817ce73e0f23
2011-02-16 12:03:10 -08:00
Scott Main
f722cecd18
Merge "docs: update homepage for 3.0 announcement" into honeycomb
2011-02-16 11:58:40 -08:00
Scott Main
7fbeaf9286
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
...
Change-Id: I6021cd0eb9d37a004036249305819a352efa4f92
2011-02-16 11:55:10 -08:00
Daniel Sandler
439f5c6b39
Merge "Fix NPE."
2011-02-16 11:32:39 -08:00
James Dong
d33a4ccb5c
Decouple AudioRecord read and audio encoding
...
bug - 3313754
Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
2011-02-16 11:23:21 -08:00
Robert Greenwalt
5a5b4ba9fe
am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '271397cfb2b79d1346568209b37b1f57707f924a':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:58:34 -08:00
Kenny Root
bb9d394b21
Clean up use of HAVE_ANDROID_OS
...
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.
Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
2011-02-16 10:56:32 -08:00
Robert Greenwalt
271397cfb2
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:55:54 -08:00
Andy Stadler
d26727273d
@hide DPM global proxy settings
...
They don't work as advertised, so remove from SDK.
Bug: 3460938
Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
2011-02-16 10:53:33 -08:00
Robert Greenwalt
de27b51958
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:51:04 -08:00
Fabrice Di Meglio
8761bfaa8d
Merge "Code cleaning"
2011-02-16 10:48:12 -08:00
Robert Greenwalt
3259d88537
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
2011-02-16 10:44:26 -08:00
Eric Fischer
da9a17019e
am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'aebe3dfe61ba889962174cf9e24783770af31e02':
Import revised translations. DO NOT MERGE
2011-02-16 10:41:59 -08:00
Shimeng (Simon) Wang
96b065f001
Remember zoom overview state since the postscale callback is async.
...
issue: 3451476
Change-Id: I56eaeff4e35f8a791b990fcdd1188ca6cdef601a
2011-02-16 10:38:21 -08:00
Eric Fischer
aebe3dfe61
am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
2011-02-16 10:38:11 -08:00
Robert Greenwalt
8e9abc5b2e
Fix wifi watchdog to use InetAddress
...
Supports IPv6 and stops using deprectated DhcpInfo.
Change-Id: I0590dbcd50f56e15d9b95327ad9435cdbfc8a78d
2011-02-16 10:37:50 -08:00
Eric Fischer
874ae43ce1
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-16 10:33:18 -08:00
Alon Albert
1bad83adf0
Rename method to discourage use of this in favor of member field
...
Change-Id: Ie2d1e17e8879ad0f11fe815001fefccdd6603936
2011-02-16 10:29:56 -08:00
Alon Albert
4308735055
am 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
...
* commit '2d314d1282067518bcd34015f629c5d3e6ff15a1':
DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:28:51 -08:00
Alon Albert
2d314d1282
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
...
* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:26:53 -08:00
Scott Main
739b35fff4
am 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials
...
* commit '415ef50d902dddfe974f3a280733ae3769931143':
docs: add breadcrumbs to articles and tutorials
2011-02-16 10:25:29 -08:00
Alon Albert
b79db4cd5c
am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
...
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:24:15 -08:00
Scott Main
415ef50d90
am 796ce77a: docs: add breadcrumbs to articles and tutorials
...
* commit '796ce77abf3d1d006576490c286e72ebf0736280':
docs: add breadcrumbs to articles and tutorials
2011-02-16 10:23:05 -08:00