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
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
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
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
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
a429d5df1a
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -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
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
27ac64ecee
Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
2011-05-17 16:42:48 -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
da48094557
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-17 13:25:22 -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
Eric Fischer
876533d98a
Import revised translations. DO NOT MERGE
...
Change-Id: I2f5dcc745a5c9f3d7443d03b9dfe4b6e584db58c
2011-05-17 12:19:30 -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
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
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
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
Adam Powell
79411726d5
Merge "Turn fading edges back on for ScrollView and HorizontalScrollView." into honeycomb-mr2
2011-05-17 09:41:33 -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
Xavier Ducrohet
05b7b69c6c
LayoutLib: support the new baseline/margin query API.
...
Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
2011-05-16 16:29:03 -07:00
Roman Nurik
8f3dbe1c37
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.
2011-05-16 16:01:27 -07:00
Roman Nurik
ce6253d8fd
Merge "Add link to Speech Input article to resource browser, tweak outdated information in the article." into honeycomb-mr1
2011-05-16 15:58:08 -07:00
Adam Powell
aff08381a3
Turn fading edges back on for ScrollView and HorizontalScrollView.
...
Change-Id: Iba880fef0083d36d105b387e4184c57a5fd62486
2011-05-16 14:04:31 -07:00
Irfan Sheriff
cff1093fd2
Merge "Fix ISO country code of Slovenia." into honeycomb-mr2
2011-05-16 14:02:39 -07:00
Scott Main
8a29ffa3b0
am 7a701024: docs: add redirects to key legacy docs bug: 4439292
...
* commit '7a701024be7e58f840ebf9636cdad62ee4606b72':
docs: add redirects to key legacy docs bug: 4439292
2011-05-16 14:01:30 -07:00
Roman Nurik
ecaf3f4f28
Add link to Speech Input article to resource browser, tweak outdated information in the article.
...
Change-Id: I5715f8bf7f2f11e5005cc3e9541846ac06797ac6
2011-05-16 14:00:13 -07:00
Robert Greenwalt
188b9e9ec0
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
2011-05-16 13:58:37 -07:00
Scott Main
7a701024be
docs: add redirects to key legacy docs
...
bug: 4439292
Change-Id: Ifd8f590504507fe417aae102a757cb7eae5507a3
2011-05-16 13:54:02 -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
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
Dianne Hackborn
68066c2f38
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
2011-05-16 13:08:07 -07:00
Dianne Hackborn
9d0f2c6d97
Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
2011-05-16 13:01:07 -07:00
Dianne Hackborn
29735689ce
DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
...
Change-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a
2011-05-16 12:57:38 -07:00
Dianne Hackborn
1e662c3294
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
2011-05-16 12:54:22 -07:00
Mike Lockwood
15afd076d6
Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
2011-05-16 12:34:35 -07:00
Mike Lockwood
0a93d87552
Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
2011-05-16 12:34:02 -07:00
Robert Ly
79d3f6305f
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
2011-05-16 12:29:17 -07:00
Robert Ly
904f48107e
doc change: added link to diydrones and a few small changes
...
Change-Id: I4ca757f3dfb60f442c34cfbb4e7145eacb42b395
2011-05-16 12:19:24 -07:00
Dianne Hackborn
ac8dea12c1
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
2011-05-16 11:58:27 -07:00
Mike Lockwood
51690544aa
MTP: Have GetStorageInfo command return correct storage type for removable storage
...
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-16 14:29:45 -04:00
Mike Lockwood
2f6a388553
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>
2011-05-16 14:29:23 -04:00