Romain Guy
71fcc865e3
Merge "Code cleanup."
2011-05-19 16:16:43 -07:00
Romain Guy
88b4f153e2
Code cleanup.
...
Change-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3
2011-05-19 16:15:46 -07:00
John Reck
9414b04178
Merge "expandGroup can now animate"
2011-05-19 15:23:58 -07:00
Kenny Root
a51b6fd6f8
resolved conflicts for merge of b2d0ee16 to master
...
Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4
2011-05-19 15:02:18 -07:00
Kenny Root
b2d0ee164a
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-05-19 12:48:41 -07:00
Kenny Root
e6cd0c747e
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp
...
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
2011-05-19 12:48:14 -07:00
Wink Saville
b568b51255
am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
Reset connection while data state changed.
2011-05-19 11:32:27 -07:00
Wink Saville
09ded82b78
am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Wink Saville
ab5baa1d5f
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Kenny Root
2433c443bb
am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread
...
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API
2011-05-19 11:04:01 -07:00
Kenny Root
f2006f3123
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
Mike Lockwood
44bcfcae3b
Merge "resolved conflicts for merge of c1730dcf to master"
2011-05-19 10:52:43 -07:00
Mike Lockwood
90f902afde
resolved conflicts for merge of c1730dcf to master
...
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
2011-05-19 13:34:44 -04:00
Cibu Johny
1714c21c15
View horizontalDirection public attribute resolution to an internal var.
...
- add more comment
Change-Id: I514c6ace3a98d56aa0b5c52221dee3045656071f
2011-05-19 10:18:16 -07:00
John Reck
63f46e7145
expandGroup can now animate
...
Add a boolean to have expandGroup animate the same as
performItemClick does
Change-Id: I652c6fa8f9a7b527572337b11900d653b5285352
2011-05-19 10:10:51 -07:00
Mike Lockwood
c1730dcf89
am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
2011-05-19 10:06:44 -07:00
Mike Lockwood
ae448e2c90
am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569
USB: Add method to access raw USB device descriptors
...
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Jean-Baptiste Queru
5c3816f2ff
Merge c41aefe1
...
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
2011-05-19 07:54:53 -07:00
Jean-Baptiste Queru
c6b7a0131e
Merge 111d17ce
...
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
2011-05-19 07:17:00 -07:00
Svetoslav Ganov
d36a699410
Fixing my build fix
...
Change-Id: I8393e0172367de730123b2fa9d743b1ecb2eb087
2011-05-18 20:50:03 -07:00
Kazuhiro Ondo
8904c3d814
am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change.
...
* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
Linkproperties update via unsol data call state change.
2011-05-18 17:48:37 -07:00
Robert Greenwalt
c41aefe1d4
am 59b1a4ed: Switch to use netd to add/remove routes.
...
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
2011-05-18 16:33:16 -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
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
Jean-Baptiste Queru
6c427617be
Merge "support humidity sensor type"
2011-05-18 15:00:11 -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
Eino-Ville Talvala
706804e2e4
Merge "Add auto-white balance locking to the Camera API."
2011-05-18 08:54:40 -07: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
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
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
5d6c990b7f
Fix bug 4416126 - orientation change bug with action bar overflow menu
...
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Mike Lockwood
53b988ba18
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:49:40 -07:00
Mike Lockwood
5a79cfd751
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00
Jaikumar Ganesh
71f017e0b0
Merge "Improve locking granularity for PAN and Input."
2011-05-17 15:12:00 -07:00
Jaikumar Ganesh
6003fe9af0
Improve locking granularity for PAN and Input.
...
Long term, all this needs to be converted to a state machine.
Change-Id: I757a04994cd04e490a632b433e62b00a23880638
2011-05-17 15:10:00 -07:00
Romain Guy
0a2ed6de7b
Merge "Improve LayoutInflater's compliance."
2011-05-17 15:06:09 -07:00
Romain Guy
9c1223a713
Improve LayoutInflater's compliance.
...
There are standards, we should do our best to implement them
properly.
Change-Id: I83a7dc0651795d09b19d536c17b6aefc2eca5c81
2011-05-17 14:25:49 -07:00
Mike Lockwood
fbfe555125
StorageVolume: Add getStorageId() accessor
...
This ID is used for MTP as well as per volume querying in the media provider.
Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 17:19:37 -04:00
Fabrice Di Meglio
dff7897548
Merge "View horizontalDirection public attribute resolution to an internal var."
2011-05-17 14:16:43 -07:00
Chet Haase
63e2c0888d
Merge "Fix for using HARDWARE layers on unaccelerated views."
2011-05-17 14:00:53 -07:00
Adam Powell
5d4034a37e
resolved conflicts for merge of 2b6ace58 to master
...
Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda
2011-05-17 13:41:24 -07:00
Chet Haase
6f33e81a0b
Fix for using HARDWARE layers on unaccelerated views.
...
If a view is not accelerated but has its layer type set to
LAYER_TYPE_HARDWARE, then the framework will use the old drawing cache
approach, to cache it in a bitmap. This works fine, but when the layer
is set to NONE, that drawing cache is not destroyed, as it would be were
the layer set to LAYER_TYPE_SOFTWARE. This prevents future invalidations on
the view from working correctly because the bitmap cache has never been
destroyed and recreated.
The fix is to always destroy the drawing cache when the layer type is
changed from SOFTWARE or HARDWARE, to make sure that it gets set appropriately
regardless of the state of the view's acceleration.
Change-Id: I449649e6d370477825015505da76564455a156e6
2011-05-17 12:42:19 -07:00
Jeff Sharkey
78ae81efa9
Merge "First pass at NetworkPolicy and activity tracking."
2011-05-17 12:27:01 -07:00
Adam Powell
2b6ace5811
am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
Prevent cases of bogus action bar measurement.
2011-05-17 12:21:22 -07:00
Adam Powell
bd32a79ecb
am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
...
* commit 'f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
2011-05-17 12:18:05 -07:00
Adam Powell
1b4a1628f3
Prevent cases of bogus action bar measurement.
...
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00