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
Ying Wang
65ee22aa01
Fix intermediate src dir for framework.jar
...
Intermediate src dir for JAVA_LIBRARIES should be in the common
intermediate dir.
Change-Id: Ib16ddd63aed080cdd1494204b347c1e1e1beafcb
2011-05-18 09:48: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
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
Eino-Ville Talvala
d9c2601afa
Add auto-white balance locking to the Camera API.
...
Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.
Hidden for now.
Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
2011-05-17 10:52:42 -07:00
Dianne Hackborn
0305e354e1
This API change is now part of MR2.
...
Change-Id: I242e66fb9c46d48244942298361f408062fb05c4
2011-05-17 10:49:53 -07:00
Adam Powell
143c529f28
am 21f1d49f: am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit '21f1d49f0eac47c1ebbabf82f145dc60f988d069':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:55:53 -07:00
Adam Powell
21f1d49f0e
am a7f52d46: Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
...
* commit 'a7f52d4665967b4331d38408ba81af37ec589cb4':
DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge.
2011-05-17 09:45:29 -07:00
Adam Powell
a7f52d4665
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
2011-05-17 09:41:52 -07:00
Narayan Kamath
b956f37e37
Pass synthesis request params through to the TTS service.
...
Change-Id: I1ffd617d8dfa0814382643e3cf6b3ab7417c742a
2011-05-17 09:47:59 +01:00
Mathias Jeppsson
e3b9dc107e
Require bonding and encryption for PBAP server
...
The Phonebook Access Profile specification requires bonding and
encryption. For devices not supporting SSP (Secure Simple Pairing),
InsecureRfcomm will require neither. Adding EncryptedRfcomm to force
bonding and encryption but not requiring authenticated link key.
Change-Id: If47cca9c5ffd89358bcd61d64f7785d17e0ca7cc
2011-05-17 07:52:15 +02:00
Dianne Hackborn
9d31154d0b
am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit 'b68c768ddb57407bc253230c677056329c9e4bae':
Add new command line option to change global screen size.
2011-05-16 21:39:47 -07:00
Dianne Hackborn
b68c768ddb
am 41744836: am 7916ac65: Add new command line option to change global screen size.
...
* commit '417448369c170a34d76c477aa19c5293e3caa1df':
Add new command line option to change global screen size.
2011-05-16 21:29:32 -07:00
Dianne Hackborn
417448369c
am 7916ac65: Add new command line option to change global screen size.
...
* commit '7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
2011-05-16 21:21:24 -07:00
Dianne Hackborn
7916ac65dc
Add new command line option to change global screen size.
...
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
2011-05-16 20:55:41 -07:00
Cibu Johny
8666663e6e
View horizontalDirection public attribute resolution to an internal var.
...
Change-Id: Id87ab188faef27ff039cf6a400118707ee74a27d
2011-05-16 16:03:31 -07:00
Fabrice Di Meglio
b5dde704cd
Merge "Adding horizontalDirection public attribute for View."
2011-05-16 15:13:10 -07:00
Cibu Johny
7632cb9be5
Adding horizontalDirection public attribute for View.
...
Change-Id: Ic8a03447252e4e155c3ee874b1d8c8ac0bc9f7f5
2011-05-16 15:08:27 -07:00
Adam Powell
b07f943273
DO NOT MERGE Use action bar overflow menus on large configurations as
...
well as xlarge.
ICS will have a more intelligent way of determining this.
Change-Id: I1ba6460dec09b8259db858c78a9157bb7742c85d
2011-05-16 13:46:38 -07:00
Dianne Hackborn
60e13114eb
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '1d340a3c24913d8750900355cd92ef5742eea11f':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:16:45 -07:00
Dianne Hackborn
1d340a3c24
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
...
* commit '0eac092766d7871b34927442ee0b6e27e7e1317b':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
2011-05-16 13:13:00 -07:00
Dianne Hackborn
0eac092766
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
2011-05-16 13:10:23 -07:00