James Dong
d148a499c2
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Jim Miller
9f0f0e0e31
First pass at integrating new ScrollView-based recents panel.
...
- added layout transitions
- now calls removeTask() for selected activity.
Change-Id: Ie57b3d79551353a564bb2e4da26243a10bb0198d
2011-05-18 16:03:31 -07:00
Wink Saville
be2b058ec1
Reset connection while data state changed.
...
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Jean-Baptiste Queru
111d17ce51
Merge 4b999030
...
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
2011-05-18 15:33:27 -07:00
Irfan Sheriff
ffcea7ae73
Move softap config handling to WifiConfigStore
...
Move softap config to flat file and read/write on a seperate handler thread
Bug: 4391796
Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
2011-05-18 15:29:31 -07:00
Robert Greenwalt
59b1a4ede7
Switch to use netd to add/remove routes.
...
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Jean-Baptiste Queru
4b999030ad
am 6c427617: Merge "support humidity sensor type"
...
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
2011-05-18 15:20:29 -07:00
Dianne Hackborn
ba8fc5b059
am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
...
* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
Fix fake display size when rotated.
2011-05-18 15:16:05 -07:00
Dianne Hackborn
8416e5cf0a
am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
...
* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
2011-05-18 15:12:07 -07:00
Dianne Hackborn
6ad07db7a2
Merge "Fix fake display size when rotated." into honeycomb-mr2
2011-05-18 15:09:58 -07:00
Dianne Hackborn
8f7c271ac9
Fix fake display size when rotated.
...
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
2011-05-18 15:07:48 -07:00
Jean-Baptiste Queru
6c427617be
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Daniel Sandler
cb3cf992ae
Merge "Turn off navbar for now."
2011-05-18 14:44:16 -07:00
Mathias Agopian
4235e03417
Merge "Disable error report temporarily to enable inline video"
2011-05-18 14:43:53 -07:00
Daniel Sandler
4653a02105
Turn off navbar for now.
...
Change-Id: I7b80312e172ccbf4b6ce30a35367fa14418368fb
2011-05-18 17:42:29 -04:00
Teng-Hui Zhu
bca2d5b3df
Disable error report temporarily to enable inline video
...
bug:4435022
Change-Id: I06f05a4781ad432ab71db93f0815eb89cd2e7a69
2011-05-18 14:37:51 -07:00
Guang Zhu
2b57689d8b
Merge "call clearCache from UI thread"
2011-05-18 14:21:29 -07:00
Fabrice Di Meglio
41701ac5f6
Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"
2011-05-18 12:50:34 -07:00
Dianne Hackborn
fb03c4fafe
am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
Improve compat mode scaling implementation.
2011-05-18 10:36:14 -07:00
Adam Powell
2e6b4ad76c
resolved conflicts for merge of f61c3d07 to master
...
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
2011-05-18 10:33:20 -07:00
Katie McCormick
37250130b6
am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '2c898da6d3306e041da0165607555303203ec86d':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-18 10:25:02 -07:00
Guang Zhu
c1635bf14e
call clearCache from UI thread
...
according to the warning message, WebView#clearCache now should be
invoked from UI thread only
Change-Id: I089d9dcdcccc353b802a628c539e62f001d361f8
2011-05-18 10:14:44 -07:00
Jean-Baptiste Queru
a49b2dbdde
am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
...
* commit 'a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.
2011-05-18 09:52:18 -07:00
Jean-Baptiste Queru
a38762f340
am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
...
* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.
2011-05-18 09:46:16 -07:00
James Dong
af3131fe2e
Publish setLocation() method as a public Java API
...
related-to-bug: 4260295
Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
2011-05-18 09:41:57 -07:00
Andreas Huber
9516aee4c1
Merge "Properly forward rotation information from input format to output format."
2011-05-18 09:40:52 -07:00
Andreas Huber
0920bca3ab
Properly forward rotation information from input format to output format.
...
The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.
Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
2011-05-18 09:31:22 -07:00
Gloria Wang
8d161fe1ea
am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:30:01 -07:00
Jean-Baptiste Queru
7ae7d31c2f
Merge "MOTOYA changed two kinds of Japanese font files."
2011-05-18 09:24:40 -07:00
Mike Lockwood
fa1e5561cc
am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
StorageVolume: Add getStorageId() accessor
2011-05-18 09:23:35 -07:00
John Reck
74bafe40d7
am c54d3a98: am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit 'c54d3a987235c615715e45f5a22ba75e6fae22b3':
Don't use mobile for large uastring
2011-05-18 09:23:22 -07:00
Eric Fischer
cd4877f0e7
am 49ac7418: (-s ours) am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '49ac741841224b9ff2579f6b7722dc7eb0ebcd3a':
Import revised translations. DO NOT MERGE
2011-05-18 09:21:13 -07:00
Gloria Wang
5a6c3d491c
am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:19:56 -07:00
Gloria Wang
07e9267d33
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Eino-Ville Talvala
706804e2e4
Merge "Add auto-white balance locking to the Camera API."
2011-05-18 08:54:40 -07:00
Mike Lockwood
b6aabcf6e3
resolved conflicts for merge of 22c140b7 to master
...
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
2011-05-18 09:25:49 -04:00
Kazuhiro Ondo
b22a9fd9bb
am 01758e81: Linkproperties update via unsol data call state change.
...
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
2011-05-18 00:02:31 -07:00
Wink Saville
748caa8a7e
Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"
2011-05-17 23:32:01 -07:00
James Dong
f84e4a657f
Revert "Add const to the finders method in MetaData.cpp"
...
This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.
Conflicts:
include/media/stagefright/MPEG4Writer.h
Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
2011-05-17 22:39:06 -07:00
JP Abgrall
cb4d1a91fc
dumpstate: don't attempt to use vril-dump, it breaks adb bugreport
...
http://b/4442803 vril-dump's usage of adb causes bugreport to hang
lcm-dump.sh re-uses adb which breaks.
Change-Id: I5eeb30f78793c0a6d10bfaf0097d6aa7b811cf66
Signed-off-by: JP Abgrall <jpa@google.com>
2011-05-17 21:35:54 -07:00
Kazuhiro Ondo
01758e81b3
Linkproperties update via unsol data call state change.
...
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.
Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Wink Saville
e34a7686a3
am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
...
* commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47':
Remove SIM operator name hack
2011-05-17 20:38:05 -07:00
Wink Saville
258208a78c
Merge "Remove SIM operator name hack" into honeycomb-LTE
2011-05-17 20:35:35 -07:00
Adam Powell
961f8bef18
am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:28:06 -07:00
Adam Powell
98603eed2f
am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '30a76196c8f426b530a80166817d3280acb2b100':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:25:58 -07:00
Adam Powell
30a76196c8
Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
2011-05-17 20:24:39 -07:00
Adam Powell
5d6c990b7f
Fix bug 4416126 - orientation change bug with action bar overflow menu
...
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Fabrice Di Meglio
78b868ff42
Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor
...
- take care of empty strings in TextLayoutCache when computing advances/glyphs with Harfbuzz
Change-Id: I8eb5f632feb7a86e5c4a6db03d073c4b7d859dbc
2011-05-17 19:56:20 -07:00
Dianne Hackborn
4f9bb17f7e
am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
Improve compat mode scaling implementation.
2011-05-17 18:42:23 -07:00
Dianne Hackborn
c2db21445d
am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
2011-05-17 18:40:12 -07:00