Justin Ho
500608d2f7
am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit '57162cdcdeaacc826011f98d0285c6034797f5f3':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:24:51 -08:00
Justin Ho
bce08aed25
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Adam Powell
2672362aa3
am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
...
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:43:45 -08:00
Justin Ho
8b6836f800
am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'dacf0d022f1f78e60fffcd8b6b547743cca51c76':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:41:53 -08:00
Adam Powell
c59d880b61
Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
2011-03-10 21:40:38 -08:00
Justin Ho
23fc9022d7
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Huahui Wu
974b33351e
am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
...
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/4080388 Improving the performance of ZoomManager
2011-03-10 21:27:24 -08:00
Huahui Wu
df328a2e04
Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
2011-03-10 21:25:47 -08:00
Ken Sumrall
06b72dc76e
am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
...
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
Teach the framework to use the new android_reboot() function.
2011-03-10 19:27:05 -08:00
Ken Sumrall
45d6471556
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
2011-03-10 19:24:42 -08:00
Jamie Gennis
da38c1f186
am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
...
* commit 'b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:07:57 -08:00
Jamie Gennis
c2cc1b3f97
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
2011-03-10 18:06:32 -08:00
Mathias Agopian
ca9cbe8fa2
am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
...
* commit 'e90c4998b514f738b3655e55b51a38119b8c5f23':
fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:37:47 -08:00
Mathias Agopian
069160eba0
Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
2011-03-10 17:36:15 -08:00
Teng-Hui Zhu
7b45a5b73a
am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
...
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
40ce089c12
Merge "Inline HTML5 Video support" into honeycomb-mr1
2011-03-10 17:10:29 -08:00
Adam Powell
4bbbdba6b3
am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
...
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
Fix bug 4080407 - Browser stuck after scrolling- page stops responding
2011-03-10 17:07:52 -08:00
Adam Powell
672f2f2b66
Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
2011-03-10 17:06:11 -08:00
Jamie Gennis
7a4d0dfd43
SurfaceFlinger: Respect the PROTECTED gralloc bit.
...
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.
Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
2011-03-10 16:25:48 -08:00
Scott Main
3c041ed2ff
am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'dc8b70cabc23316e349aaf2fe03bcc830dd66e6c':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:57:38 -08:00
Scott Main
229042cb48
am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:57:34 -08:00
Xia Wang
af268fff07
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
...
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 15:57:27 -08:00
Scott Main
3b4f8b2ca5
am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:40:32 -08:00
Scott Main
0b01fccb6d
am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:40:23 -08:00
Xia Wang
416132888b
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
2011-03-10 15:29:12 -08:00
Scott Main
e3fd9b8044
Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
2011-03-10 15:17:42 -08:00
Scott Main
ffb7903b47
Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
ba0f2a3467
am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
...
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:12:34 -08:00
Rajneesh Chowdury
85df20657a
Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
2011-03-10 15:10:39 -08:00
Xia Wang
e37f468ed4
resolved conflicts for merge of 16cbe575 to honeycomb-mr1
...
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
29b37fc799
am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
Import revised translations. DO NOT MERGE
2011-03-10 14:47:57 -08:00
Eric Fischer
8e59190afd
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 14:46:18 -08:00
Xia Wang
696229eecf
Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb
2011-03-10 14:21:50 -08:00
Justin Ho
94b95f7ee5
am fa1d72c8: Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
...
* commit 'fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
New textfield search assets Bug: 3321263
2011-03-10 13:55:21 -08:00
Justin Ho
5600135d77
Merge "New textfield search assets Bug: 3321263" into honeycomb-mr1
2011-03-10 13:53:48 -08:00
Eric Fischer
e00be2b00d
am 8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '8d257f85acc3316b9ba451337f7cbea9000eb8cf':
Import revised translations. DO NOT MERGE
2011-03-10 13:46:28 -08:00
Eric Fischer
6f186ab677
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-10 11:42:24 -08:00
Shimeng (Simon) Wang
b3f3a843b7
am 0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
...
* commit '0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
Don't limit zoom scale change by the minimum increment.
2011-03-10 09:07:22 -08:00
Kristian Monsen
addcaaa689
am 79b87df5: Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
...
* commit '79b87df58861faeedd85804f6ea4f24eb67aef12':
Fix for bug 4064291 WebView uses PackageManager#getInstalledApps
2011-03-10 09:05:18 -08:00
Shimeng (Simon) Wang
f5022eebf3
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
2011-03-10 09:04:12 -08:00
Kristian Monsen
63d02e0b7f
Merge "Fix for bug 4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
2011-03-10 09:01:58 -08:00
Mike Lockwood
8f6c4b055a
am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
...
* commit 'cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:52:30 -08:00
Mike Lockwood
14c2c61a31
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
2011-03-10 07:50:30 -08:00
TK MUN
e83a221b15
am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support
...
* commit 'c01fd043a92462f12210d45a92d751b49e0e1f62':
DO NOT MERGE WiMAX support
2011-03-09 22:58:12 -08:00
TK MUN
b425516715
am 4bdab175: DO NOT MERGE WiMAX support
...
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
Jeff Brown
79f410478e
am 3de30a4c: Update API.
...
* commit '3de30a4c1e48d92af14154abddd4fb6fe0c6aa13':
Update API.
2011-03-09 19:35:28 -08:00
Jeff Brown
4a5f036881
am efd3266b: Input improvements and bug fixes.
...
* commit 'efd3266b719eed5f1b217021c0a9e76e4b274b06':
Input improvements and bug fixes.
2011-03-09 18:36:52 -08:00
Jeff Brown
0e4b6af3cf
am 9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
...
* commit '9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
Recognize 3D joysticks. (DO NOT MERGE)
2011-03-09 18:36:46 -08:00
Jeff Brown
46689da7ee
Input improvements and bug fixes.
...
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis. This fixes new API that was introduced in MR1.
(Bug: 4066146)
Fixed a bug that might cause a segfault when using a trackball.
Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.
Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.
Improved the batching code to support batching events from different
sources of the same device in parallel. (Bug: 3391564)
Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Jeff Brown
287b193a1e
am 18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
...
* commit '18955491ee52aad9bfe6f06e46da77aed6ee092a':
Fix off by one errors in touch motion ranges. (DO NOT MERGE)
2011-03-09 18:29:31 -08:00