OSDN Git Service
Wink Saville [Thu, 19 May 2011 18:25:45 +0000 (11:25 -0700)]
Merge "Reset connection while data state changed." into honeycomb-LTE
Joe Fernandez [Thu, 19 May 2011 17:59:16 +0000 (10:59 -0700)]
am
146a0b45: am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
146a0b4522db2d782953a464fe63adcd7e1569c2':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:53:04 +0000 (10:53 -0700)]
am
fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '
fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Joe Fernandez [Thu, 19 May 2011 17:49:45 +0000 (10:49 -0700)]
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
Mike Lockwood [Thu, 19 May 2011 17:01:53 +0000 (10:01 -0700)]
am
a88b42d5: USB: Add method to access raw USB device descriptors
* commit '
a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
Mike Lockwood [Thu, 19 May 2011 15:52:40 +0000 (11:52 -0400)]
USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adam Powell [Thu, 19 May 2011 02:14:44 +0000 (19:14 -0700)]
am
b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit '
b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Adam Powell [Thu, 19 May 2011 02:13:22 +0000 (19:13 -0700)]
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
Adam Powell [Thu, 19 May 2011 02:10:46 +0000 (19:10 -0700)]
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
Xavier Ducrohet [Thu, 19 May 2011 00:43:27 +0000 (17:43 -0700)]
am
b18e700c: am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:40:08 +0000 (17:40 -0700)]
am
aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit '
aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Thu, 19 May 2011 00:36:16 +0000 (17:36 -0700)]
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
James Dong [Wed, 18 May 2011 23:09:58 +0000 (16:09 -0700)]
am
d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
* commit '
d148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
James Dong [Wed, 18 May 2011 23:06:14 +0000 (16:06 -0700)]
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
Wink Saville [Wed, 18 May 2011 22:59:04 +0000 (15:59 -0700)]
Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
Robert Greenwalt [Tue, 10 May 2011 22:05:02 +0000 (15:05 -0700)]
Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
Dianne Hackborn [Wed, 18 May 2011 22:12:07 +0000 (15:12 -0700)]
am
6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '
6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
Dianne Hackborn [Wed, 18 May 2011 22:09:58 +0000 (15:09 -0700)]
Merge "Fix fake display size when rotated." into honeycomb-mr2
Dianne Hackborn [Wed, 18 May 2011 22:07:48 +0000 (15:07 -0700)]
Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
Gloria Wang [Wed, 18 May 2011 16:19:56 +0000 (09:19 -0700)]
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:
Gloria Wang [Wed, 18 May 2011 16:17:50 +0000 (09:17 -0700)]
Merge "DO NOT MERGE For bug
4422428 Squashed commit of the following:" into honeycomb-mr2
Kazuhiro Ondo [Sun, 1 May 2011 01:10:57 +0000 (20:10 -0500)]
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
Wink Saville [Wed, 18 May 2011 03:35:35 +0000 (20:35 -0700)]
Merge "Remove SIM operator name hack" into honeycomb-LTE
Adam Powell [Wed, 18 May 2011 03:25:58 +0000 (20:25 -0700)]
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
Adam Powell [Wed, 18 May 2011 03:24:39 +0000 (20:24 -0700)]
Merge "Fix bug
4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 03:20:47 +0000 (20:20 -0700)]
Fix bug
4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
Dianne Hackborn [Wed, 18 May 2011 01:40:12 +0000 (18:40 -0700)]
am
a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit '
a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
Dianne Hackborn [Wed, 18 May 2011 01:38:37 +0000 (18:38 -0700)]
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
Adam Powell [Wed, 18 May 2011 01:32:06 +0000 (18:32 -0700)]
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.
Adam Powell [Wed, 18 May 2011 01:30:08 +0000 (18:30 -0700)]
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
Dianne Hackborn [Wed, 18 May 2011 00:44:51 +0000 (17:44 -0700)]
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
Adam Powell [Tue, 17 May 2011 03:32:16 +0000 (20:32 -0700)]
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
Kazuhiro Ondo [Tue, 17 May 2011 23:13:57 +0000 (18:13 -0500)]
Remove SIM operator name hack
Change-Id: I28c6f94dd6c6bab3a3025f67013a39b3ea0fb0a1
Katie McCormick [Wed, 18 May 2011 00:40:38 +0000 (17:40 -0700)]
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
Katie McCormick [Wed, 18 May 2011 00:38:04 +0000 (17:38 -0700)]
am
566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
* commit '
566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Katie McCormick [Tue, 29 Mar 2011 00:08:08 +0000 (17:08 -0700)]
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
Change-Id: I7dd7ec732aa3089b4e20d5a859f35e1bbd846c3b
Mike Lockwood [Tue, 17 May 2011 23:44:51 +0000 (16:44 -0700)]
am
27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
* commit '
27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
Mike Lockwood [Tue, 17 May 2011 23:42:48 +0000 (16:42 -0700)]
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
John Reck [Tue, 17 May 2011 23:18:11 +0000 (16:18 -0700)]
am
1147bf63: Don\'t use mobile for large uastring
* commit '
1147bf638a791ef403c0cc6654f4decd1b0d67c1':
Don't use mobile for large uastring
Joe Fernandez [Thu, 12 May 2011 17:00:25 +0000 (10:00 -0700)]
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
John Reck [Tue, 17 May 2011 21:38:44 +0000 (14:38 -0700)]
Don't use mobile for large uastring
Bug:
4427114
Change-Id: I0bf58fd2c340e66c15bf782819bf896d227c5455
Mike Lockwood [Tue, 17 May 2011 21:19:37 +0000 (17:19 -0400)]
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>
Eric Fischer [Tue, 17 May 2011 20:27:59 +0000 (13:27 -0700)]
am
da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
da4809455716cf16451ca5db79654370a6a44f17':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 May 2011 20:25:22 +0000 (13:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Mike Lockwood [Tue, 17 May 2011 20:12:32 +0000 (13:12 -0700)]
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
Mike Lockwood [Tue, 17 May 2011 20:08:22 +0000 (16:08 -0400)]
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>
Eric Fischer [Tue, 17 May 2011 19:19:30 +0000 (12:19 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
Adam Powell [Tue, 17 May 2011 19:18:05 +0000 (12:18 -0700)]
am
f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
* commit '
f721b398ad69503e1212e5fe8a44d176d25f135a':
Prevent cases of bogus action bar measurement.
Adam Powell [Tue, 17 May 2011 19:16:29 +0000 (12:16 -0700)]
Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 19:13:13 +0000 (12:13 -0700)]
Prevent cases of bogus action bar measurement.
Change-Id: I92d3bc41aa82835e1aa23f208ab61e943266f186
Scott Main [Tue, 17 May 2011 18:22:49 +0000 (11:22 -0700)]
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
Scott Main [Tue, 17 May 2011 18:19:01 +0000 (11:19 -0700)]
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
Scott Main [Tue, 17 May 2011 17:17:26 +0000 (10:17 -0700)]
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
Andreas Huber [Tue, 17 May 2011 17:31:58 +0000 (10:31 -0700)]
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
Andreas Huber [Tue, 17 May 2011 17:29:36 +0000 (10:29 -0700)]
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 16:45:29 +0000 (09:45 -0700)]
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.
Adam Powell [Tue, 17 May 2011 16:45:26 +0000 (09:45 -0700)]
am
79411726: Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
* commit '
79411726d5a0eb0f439b90e2f262e0b983e55d9c':
Turn fading edges back on for ScrollView and HorizontalScrollView.
Adam Powell [Tue, 17 May 2011 16:41:52 +0000 (09:41 -0700)]
Merge "DO NOT MERGE Use action bar overflow menus on large configurations as well as xlarge." into honeycomb-mr2
Adam Powell [Tue, 17 May 2011 16:41:33 +0000 (09:41 -0700)]
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
Dianne Hackborn [Tue, 17 May 2011 04:21:24 +0000 (21:21 -0700)]
am
7916ac65: Add new command line option to change global screen size.
* commit '
7916ac65dc492e4e1431879875c77d7121fbf82e':
Add new command line option to change global screen size.
Dianne Hackborn [Tue, 17 May 2011 03:45:48 +0000 (20:45 -0700)]
Add new command line option to change global screen size.
For example:
adb shell am display-size 1024x600
Change-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726
Xavier Ducrohet [Mon, 16 May 2011 23:29:03 +0000 (16:29 -0700)]
LayoutLib: support the new baseline/margin query API.
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
Wink Saville [Mon, 16 May 2011 23:28:59 +0000 (16:28 -0700)]
Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
Roman Nurik [Mon, 16 May 2011 23:03:31 +0000 (16:03 -0700)]
am
8f3dbe1c: am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
8f3dbe1c377e64584c3ec10edf664fb278648109':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 23:01:27 +0000 (16:01 -0700)]
am
ce6253d8: Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
* commit '
ce6253d8fda92a508fa1000b5d1110e6e7a5b539':
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Roman Nurik [Mon, 16 May 2011 22:58:08 +0000 (15:58 -0700)]
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
Kazuhiro Ondo [Mon, 16 May 2011 22:28:27 +0000 (17:28 -0500)]
No data icon switch seen between LTE to EHRPD Handover
Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
Wink Saville [Mon, 16 May 2011 22:47:42 +0000 (15:47 -0700)]
Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE
Kazuhiro Ondo [Wed, 11 May 2011 04:10:37 +0000 (23:10 -0500)]
Fix data attempt while PS is not in-service
mAutoAttachOnCreation flag was incorrectly initialized which was
causing invalid data attempts while PS is not in-service.
Change-Id: Iaf16b70b1997631309a4918a99ac5f3c3ea74d02
Irfan Sheriff [Mon, 16 May 2011 21:06:11 +0000 (14:06 -0700)]
am
cff1093f: Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
* commit '
cff1093fd2a2e64634e122e32d489aa40113c22f':
Fix ISO country code of Slovenia.
Adam Powell [Mon, 16 May 2011 21:04:31 +0000 (14:04 -0700)]
Turn fading edges back on for ScrollView and HorizontalScrollView.
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486
Scott Main [Mon, 16 May 2011 21:03:43 +0000 (14:03 -0700)]
am
8a29ffa3: am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
8a29ffa3b02d5d502a6eb90c492eddcf835fc502':
docs: add redirects to key legacy docs bug:
4439292
Irfan Sheriff [Mon, 16 May 2011 21:02:39 +0000 (14:02 -0700)]
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
Scott Main [Mon, 16 May 2011 21:01:30 +0000 (14:01 -0700)]
am
7a701024: docs: add redirects to key legacy docs bug:
4439292
* commit '
7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug:
4439292
Roman Nurik [Mon, 16 May 2011 21:00:13 +0000 (14:00 -0700)]
Add link to Speech Input article to resource browser, tweak outdated information in the article.
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
Robert Greenwalt [Fri, 8 Apr 2011 16:53:55 +0000 (09:53 -0700)]
Fix ISO country code of Slovenia.
Misread an IBM site and thought it was sl-sl, but really it is sl-si.
fixes public bug 16021
Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
Scott Main [Mon, 16 May 2011 20:54:02 +0000 (13:54 -0700)]
docs: add redirects to key legacy docs
bug:
4439292
Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
Adam Powell [Mon, 16 May 2011 20:41:24 +0000 (13:41 -0700)]
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
Dianne Hackborn [Mon, 16 May 2011 20:13:00 +0000 (13:13 -0700)]
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.
Dianne Hackborn [Mon, 16 May 2011 20:10:23 +0000 (13:10 -0700)]
Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
Dianne Hackborn [Fri, 22 Apr 2011 00:26:39 +0000 (17:26 -0700)]
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Not yet working, so turned off.
Also fix a bug where the display size configuration became inconsistent
after a configuration change -- we now figure out everything about the
display size when computing a new configuration.
Change-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58
Dianne Hackborn [Mon, 16 May 2011 20:02:57 +0000 (13:02 -0700)]
am
9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '
9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Dianne Hackborn [Mon, 16 May 2011 20:01:07 +0000 (13:01 -0700)]
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
Dianne Hackborn [Fri, 22 Apr 2011 00:26:39 +0000 (17:26 -0700)]
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
Dianne Hackborn [Mon, 16 May 2011 19:57:00 +0000 (12:57 -0700)]
am
1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '
1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
Dianne Hackborn [Mon, 16 May 2011 19:54:22 +0000 (12:54 -0700)]
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
Mike Lockwood [Mon, 16 May 2011 19:38:18 +0000 (12:38 -0700)]
am
15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
* commit '
15afd076d6070374cbb4f9dcbe28dda67caa0718':
MTP: Have GetStorageInfo command return correct storage type for removable storage
Wink Saville [Mon, 16 May 2011 19:37:55 +0000 (12:37 -0700)]
Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE
Mike Lockwood [Mon, 16 May 2011 19:36:29 +0000 (12:36 -0700)]
am
0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
* commit '
0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
Mike Lockwood [Mon, 16 May 2011 19:34:35 +0000 (12:34 -0700)]
Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
Mike Lockwood [Mon, 16 May 2011 19:34:02 +0000 (12:34 -0700)]
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
Robert Ly [Mon, 16 May 2011 19:31:48 +0000 (12:31 -0700)]
am
79d3f630: am
904f4810: doc change: added link to diydrones and a few small changes
* commit '
79d3f6305fc7dda68faf674e1c500f97cc4dd570':
doc change: added link to diydrones and a few small changes
Robert Ly [Mon, 16 May 2011 19:29:17 +0000 (12:29 -0700)]
am
904f4810: doc change: added link to diydrones and a few small changes
* commit '
904f48107e2843a1e255872afac8ddf8e9513ca4':
doc change: added link to diydrones and a few small changes
Robert Ly [Mon, 16 May 2011 18:01:24 +0000 (11:01 -0700)]
doc change: added link to diydrones and a few small changes
Change-Id: I4ca757f3dfb60f442c34cfbb4e7145eacb42b395
Dianne Hackborn [Thu, 21 Apr 2011 01:18:51 +0000 (18:18 -0700)]
DO NOT MERGE. Integrate from master: Rework display size access.
Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.
Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
Kazuhiro Ondo [Sat, 14 May 2011 01:28:37 +0000 (20:28 -0500)]
Implement incremental data stall recovery in GSM DCT
Change-Id: Ibc43845c618fd1bf0b5a697568ba475e78e9d58e
Mike Lockwood [Tue, 10 May 2011 03:16:05 +0000 (20:16 -0700)]
MTP: Have GetStorageInfo command return correct storage type for removable storage
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 10 May 2011 02:08:06 +0000 (19:08 -0700)]
StorageManager: Clean up and generalize storage configuration resources
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.
Add android.os.storage.StorageVolume class
StorageManager.getVolumeList() now returns an array of StorageVolume
Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Mon, 16 May 2011 18:06:28 +0000 (11:06 -0700)]
am
700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '
700ab1c75862babba90f54e02bdc877becd4f4fc':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Dirk Dougherty [Mon, 16 May 2011 18:03:56 +0000 (11:03 -0700)]
am
8b8bfc5d: am
babf844f: Merge "Doc change: typo fix" into honeycomb-mr1
* commit '
8b8bfc5d28d9746bf30b2de45f879d9481b07d6f':
Doc change: typo fix