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
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
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
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
Dianne Hackborn
a429d5df1a
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
f61c3d077d
am 16c69222: am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '16c692229d6ed3d0df8682884b35252ea72c7c26':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:34:49 -07:00
Adam Powell
16c692229d
am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:32:06 -07:00
Adam Powell
185d9c4dbf
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Dianne Hackborn
ffb3d939cc
Improve compat mode scaling implementation.
...
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range. Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially. Instead, we just apply the inverse scale at the few
points we need to do something the app sees.
Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
2011-05-17 18:29:51 -07:00
Adam Powell
bd964f9624
Tweak padding and sizing of alert dialog elements to fit better in
...
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.
Change-Id: Icd1261063511355844579d6c5c34f32284031f82
2011-05-17 18:25:56 -07:00
Katie McCormick
2c898da6d3
am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '32638ccb66d933512f4792d120b5cd93e9a26537':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:47:48 -07:00
Kazuhiro Ondo
066704ddb4
Remove SIM operator name hack
...
Change-Id: I28c6f94dd6c6bab3a3025f67013a39b3ea0fb0a1
2011-05-17 17:44:18 -07:00
Katie McCormick
32638ccb66
am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:40:38 -07:00
Katie McCormick
4ef5f4dce6
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00
Katie McCormick
566489dbf6
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
2011-05-17 17:21:00 -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
John Reck
c54d3a9872
am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1818b4a99016486d42de1a2ff35c88bb3197cd20':
Don't use mobile for large uastring
2011-05-17 16:49:25 -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
Mike Lockwood
27ac64ecee
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -07:00
John Reck
1818b4a990
am 1147bf63: Don\'t use mobile for large uastring
...
* commit '1147bf638a791ef403c0cc6654f4decd1b0d67c1':
Don't use mobile for large uastring
2011-05-17 16:18:11 -07:00
Joe Fernandez
f6d8de6ff7
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
...
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
2011-05-17 15:13:46 -07:00
John Reck
1147bf638a
Don't use mobile for large uastring
...
Bug: 4427114
Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
2011-05-17 14:39:45 -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
Eric Fischer
49ac741841
am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'd9703697b20b666112a27d904db5fbaf391b3dd2':
Import revised translations. DO NOT MERGE
2011-05-17 13:31:48 -07:00
Eric Fischer
d9703697b2
am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit 'da4809455716cf16451ca5db79654370a6a44f17':
Import revised translations. DO NOT MERGE
2011-05-17 13:27:59 -07:00
Eric Fischer
da48094557
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -07:00
Mike Lockwood
22c140b7b9
am 798df16e: am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '798df16e3a3920ba55d7abc7ed10def6a17132bf':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:14:32 -07:00
Mike Lockwood
798df16e3a
am 50b27631: Remove some cruft that was left in config.xml by mistake
...
* commit '50b27631598d56cf2def58270ddcf1619045dda4':
Remove some cruft that was left in config.xml by mistake
2011-05-17 13:12:32 -07:00
Mike Lockwood
50b2763159
Remove some cruft that was left in config.xml by mistake
...
This should fix build breakage for products with nosdcard set.
Change-Id: I989f8630015baaf22fa3d597fc3c1c1646ce44ac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 16:08:22 -04: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
Eric Fischer
876533d98a
Import revised translations. DO NOT MERGE
...
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
2011-05-17 12:19:30 -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
f721b398ad
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
2011-05-17 12:16:29 -07:00
Adam Powell
1b4a1628f3
Prevent cases of bogus action bar measurement.
...
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
2011-05-17 12:14:17 -07:00
Scott Main
092aac23ce
am 8a769dd1: am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit '8a769dd1e3a328860c541faf56a6e676bf1dc01c':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:50:51 -07:00
Scott Main
8a769dd1e3
am a0ecd648: am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'a0ecd648ab39738e8791d9a16b5e6f4c2e5baafa':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:22:49 -07:00
Scott Main
a0ecd648ab
am dcf2f354: docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
...
* commit 'dcf2f354963c8cdf5d70263782979cf1bd18b0bf':
docs: simple update to OpenGl doc to update version support Note, this doc still needs a lot more work; this is a small step bug: 4395265
2011-05-17 11:19:01 -07:00
Scott Main
dcf2f35496
docs: simple update to OpenGl doc to update version support
...
Note, this doc still needs a lot more work; this is a small step
bug: 4395265
Change-Id: Ibe3fd816e88aa2b20ca99859b929164715f67027
2011-05-17 10:40:40 -07:00
Andreas Huber
c9eb18bb72
am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:34:41 -07:00
Andreas Huber
bf81d4be05
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
c56e81c887
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -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